1 files changed, 23 insertions, 83 deletions
diff --git a/test/postinstall/test_pkg-config.sh b/test/postinstall/test_pkg-config.sh
index 619d66b0..c417f99d 100755
--- a/test/postinstall/test_pkg-config.sh
+++ b/test/postinstall/test_pkg-config.sh
@@ -1,95 +1,35 @@
 #!/bin/sh
 
-# Post-install tests with pkg-config
+# Post-install tests with pkg-config and a Makefile
 #
 # First required argument is the installed prefix, which
-# is used to set PKG_CONFIG_PATH and LD_LIBRARY_PATH
-
-set -e
-
-echo "Running post-install tests with pkg-config"
-
-prefix=$1
-if [ -z "$prefix" ]; then
-    echo "First positional argument to the installed prefix is required"
-    exit 1
-fi
-
-export LD_LIBRARY_PATH=$prefix/lib
-
-UNAME=$(uname)
-case $UNAME in
-  Darwin*)
-    alias ldd="otool -L" ;;
-  Linux*)
-    ;;
-  MINGW* | MSYS*)
-    prefix=$(cygpath -u ${prefix})
-    export LD_LIBRARY_PATH=$prefix/bin ;;
-  *)
-    echo "no ldd equivalent found for UNAME=$UNAME"
-    exit 1 ;;
-esac
-
-export PKG_CONFIG_PATH=$prefix/lib/pkgconfig
-echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
-
-PKG_CONFIG_MODVERSION=$(pkg-config proj --modversion)
-echo "pkg-config proj --modversion: $PKG_CONFIG_MODVERSION"
-PKG_CONFIG_DATADIR=$(pkg-config proj --variable=datadir)
-echo "pkg-config proj --variable=datadir: $PKG_CONFIG_DATADIR"
-
+# is used to set PKG_CONFIG_PATH and
+# LD_LIBRARY_PATH/DYLD_LIBRARY_PATH for shared builds
+# Second argument is either shared (default) or static
 cd $(dirname $0)
+. ./common.sh
+main_setup $1 $2
 
-PROGRAM=testappprojinfo
-cd $PROGRAM
-make
-
-# Run tests from shell, count any errors
-ERRORS=0
+echo "Running post-install tests with pkg-config (${BUILD_MODE})"
 
-LDD_OUTPUT=$(ldd ./$PROGRAM | grep proj)
-LDD_SUBSTR=$LD_LIBRARY_PATH/libproj
-LDD_RPATH_SUBSTR=@rpath/libproj
-printf "Testing expected ldd output ... "
-case "$LDD_OUTPUT" in
-  *$LDD_SUBSTR*)
-    echo "passed (using path)" ;;
-  *$LDD_RPATH_SUBSTR*)
-    echo "passed (using rpath)" ;;
-  *)
-    ERRORS=$(($ERRORS + 1))
-    echo "failed: ldd output '$LDD_OUTPUT' does not contain '$LDD_SUBSTR'" ;;
-esac
+export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
 
-SEARCHPATH_OUTPUT=$(./$PROGRAM -s)
-case $UNAME in
-  MINGW* | MSYS*)
-    SEARCHPATH_OUTPUT=$(echo "$SEARCHPATH_OUTPUT" | tr '\\' '/')
-esac
-printf "Testing expected searchpath/datadir ... "
-case "$SEARCHPATH_OUTPUT" in
-  *$PKG_CONFIG_DATADIR*)
-    echo "passed" ;;
-  *)
-    ERRORS=$(($ERRORS + 1))
-    echo "failed: searchpath '$SEARCHPATH_OUTPUT' does not contain '$PKG_CONFIG_DATADIR'" ;;
-esac
-
-VERSION_OUTPUT=$(./$PROGRAM -v)
-printf "Testing expected version ... "
-case "$VERSION_OUTPUT" in
-  $PKG_CONFIG_MODVERSION)
-    echo "passed" ;;
-  *)
-    ERRORS=$(($ERRORS + 1))
-    echo "failed: '$VERSION_OUTPUT' != '$PKG_CONFIG_MODVERSION'" ;;
-esac
-
-make clean
+make_all_test_clean(){
+  set -e
+  make -f makefile.mak clean
+  make -f makefile.mak all
+  make -f makefile.mak test
+  make -f makefile.mak clean
+}
 
+echo "Testing C app"
+cd c_app
+make_all_test_clean
 cd ..
 
-(cd testcpp && make && make clean)
+echo "Testing C++ app"
+cd cpp_app
+make_all_test_clean
+cd ..
 
-exit $ERRORS
+echo "Finished running post-install tests with pkg-config (${BUILD_MODE})"