Fix new test programs to work under 'make distcheck'

diff --git a/test/Makefile.am b/test/Makefile.am
index 7f60e634eefd589899b12bd606d3d676f2cc5a15..780a5a35260a94f8519928a85d997c4b2837fbf2 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,9 +28,13 @@ if GEOTAG
 check_SCRIPTS += check_geotag.sh
 endif
 
+# Scripts and the test data that they use
 EXTRA_DIST = check_degrees_conversions.sh \
        check_metatile.sh \
-       check_geotag.sh
+       metatile_example/13/0/0/250/220/0.meta \
+       check_geotag.sh \
+       Stonehenge.jpg \
+       ViewFromCribyn-Wales-GPS.jpg
 
 degrees_converter_SOURCES = degrees_converter.c
 degrees_converter_LDADD = \

diff --git a/test/check_geotag.sh b/test/check_geotag.sh
index 0eb447a2c792060bcdd55b8f7051479f196207fd..461310033c2db599e817224bab0262abfafd30d4 100755 (executable)
--- a/test/check_geotag.sh
+++ b/test/check_geotag.sh
@@ -24,16 +24,22 @@ check_success_read_lon ()
   fi
 }
 
-# Read test
+# Enable running in test directory or via make distcheck when $srcdir is defined
+if [ -z "$srcdir" ]; then
+  srcdir=.
+fi
 
-check_success_read_lat 51.881861 ViewFromCribyn-Wales-GPS.jpg
-check_success_read_lon -3.419592 ViewFromCribyn-Wales-GPS.jpg
+# Read test
+check_success_read_lat 51.881861 $srcdir/ViewFromCribyn-Wales-GPS.jpg
+check_success_read_lon -3.419592 $srcdir/ViewFromCribyn-Wales-GPS.jpg
 
 # Write and then re-read test
-cp Stonehenge.jpg tmp.jpg
+cp $srcdir/Stonehenge.jpg tmp.jpg
+chmod +w tmp.jpg
+
 result=$(./geotag_write tmp.jpg)
-if [ $result != 0 ]; then
-  echo "geotag_write failure"
+if [ $? != 0 ]; then
+  echo "geotag_write failure - result is=$result"
   exit 1
 fi
 check_success_read_lat 51.179489 tmp.jpg

diff --git a/test/check_metatile.sh b/test/check_metatile.sh
index 4ae02758a3ea128563c11ac4195de97723d8feb5..dba50204c8be313c8b50d39542f299e3ff98945b 100755 (executable)
--- a/test/check_metatile.sh
+++ b/test/check_metatile.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-./test_metatile && rm tilefrommeta.png
+if [ -n "$srcdir" ]; then
+  ./test_metatile "$srcdir/metatile_example" && rm tilefrommeta.png
+else
+  ./test_metatile && rm tilefrommeta.png
+fi

diff --git a/test/test_metatile.c b/test/test_metatile.c
index 4fea9831467cce2ba1cf54b21a2b2f2ed1f44a34..e425f703dfe46951c71ec5341a990608620e3002 100644 (file)
--- a/test/test_metatile.c
+++ b/test/test_metatile.c
@@ -57,7 +57,10 @@ int main ( int argc, char *argv[] )
 
     err_msg[0] = 0;
 
-    len = metatile_read(dir, x, y, z, buf, tile_max, &compressed, err_msg);
+    if ( argc > 1 )
+      len = metatile_read(argv[1], x, y, z, buf, tile_max, &compressed, err_msg);
+    else
+      len = metatile_read(dir, x, y, z, buf, tile_max, &compressed, err_msg);
 
     if (len > 0) {
         // Do something with buf