1 files changed, 58 insertions, 19 deletions
diff --git a/src/gpg-error-config-test.sh b/src/gpg-error-config-test.sh
index 9d8c2ce..a9a6b8d 100755
--- a/src/gpg-error-config-test.sh
+++ b/src/gpg-error-config-test.sh
@@ -4,32 +4,71 @@ PKG_CONFIG_PATH="."
 
 export PKG_CONFIG_PATH
 
-OUTPUT_OLD=$(./gpg-error-config-old --version)
-OUTPUT_NEW=$(./gpg-error-config-new --version)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+if [ "$1" = --old-new ]; then
+    PKG_CONFIG_CMD=./gpg-error-config-old
+else
+    PKG_CONFIG_CMD="pkg-config gpg-error"
+    if ! $PKG_CONFIG_CMD --exists >/dev/null; then
+	exit 77			# Skip tests
+    fi
+fi
 
-OUTPUT_OLD=$(./gpg-error-config-old --libs)
+test_failed=""
+
+failure () {
+    (
+	echo "Test result: $*"
+	echo "====================: $PKG_CONFIG_CMD"
+	echo "$OUTPUT_OLD"
+	echo "====================: gpg-error-config-new"
+	echo "$OUTPUT_NEW"
+	echo "===================="
+    ) >> gpg-error-config-test.log
+    test_failed=yes
+}
+
+rm -f gpg-error-config-test.log
+
+OUTPUT_OLD=$($PKG_CONFIG_CMD --libs)
 OUTPUT_NEW=$(./gpg-error-config-new --libs)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --libs
 
-OUTPUT_OLD=$(./gpg-error-config-old --cflags)
+OUTPUT_OLD=$($PKG_CONFIG_CMD --cflags)
 OUTPUT_NEW=$(./gpg-error-config-new --cflags)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags
 
-OUTPUT_OLD=$(./gpg-error-config-old --mt --libs)
-OUTPUT_NEW=$(./gpg-error-config-new --mt --libs)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+OUTPUT_OLD=$($PKG_CONFIG_CMD --cflags --libs)
+OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
+[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
 
-OUTPUT_OLD=$(./gpg-error-config-old --mt --cflags)
-OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+if [ "$PKG_CONFIG_CMD" = ./gpg-error-config-old ]; then
+    OUTPUT_OLD=$($PKG_CONFIG_CMD --version)
+    OUTPUT_NEW=$(./gpg-error-config-new --version)
+    [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --version
 
-OUTPUT_OLD=$(./gpg-error-config-old --cflags --libs)
-OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+    OUTPUT_OLD=$($PKG_CONFIG_CMD --mt --libs)
+    OUTPUT_NEW=$(./gpg-error-config-new --mt --libs)
+    [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --libs
+
+    OUTPUT_OLD=$($PKG_CONFIG_CMD --mt --cflags)
+    OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags)
+    [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --cflags
+
+    OUTPUT_OLD=$($PKG_CONFIG_CMD --cflags --libs)
+    OUTPUT_NEW=$(./gpg-error-config-new --cflags --libs)
+    [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --cflags --libs
+
+    OUTPUT_OLD=$($PKG_CONFIG_CMD --mt --cflags --libs)
+    OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags --libs)
+    [ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || failure --mt --cflags --libs
+fi
+
+if [ -n "$test_failed" ]; then
+    OUTPUT_OLD=$($PKG_CONFIG_CMD --version)
+    OUTPUT_NEW=$(./gpg-error-config-new --version)
+    failure --version
 
-OUTPUT_OLD=$(./gpg-error-config-old --mt --cflags --libs)
-OUTPUT_NEW=$(./gpg-error-config-new --mt --cflags --libs)
-[ "$OUTPUT_OLD" = "$OUTPUT_NEW" ] || exit 99
+    exit 99
+fi
 
 exit 0