test_unit no longer needs to see itself

diff --git a/src/test_unit/main.c b/src/test_unit/main.c
index dae77a2..56b8840 100644 (file)
--- a/src/test_unit/main.c
+++ b/src/test_unit/main.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
        if(0 != test_bitbuffer())
                return 1;
 
-       if(0 != test_metadata(argv[0]))
+       if(0 != test_metadata())
                return 1;
 
        return 0;

diff --git a/src/test_unit/metadata.c b/src/test_unit/metadata.c
index 4c66f27..e49723a 100644 (file)
--- a/src/test_unit/metadata.c
+++ b/src/test_unit/metadata.c
@@ -20,14 +20,14 @@
 #include <stdio.h>
 
 extern int test_metadata_object();
-extern int test_metadata_file_manipulation(const char *progname);
+extern int test_metadata_file_manipulation();
 
-int test_metadata(const char *progname)
+int test_metadata()
 {
        if(0 != test_metadata_object())
                return 1;
 
-       if(0 != test_metadata_file_manipulation(progname))
+       if(0 != test_metadata_file_manipulation())
                return 1;
 
        printf("\nPASSED!\n");

diff --git a/src/test_unit/metadata.h b/src/test_unit/metadata.h
index 0d99c25..11bc964 100644 (file)
--- a/src/test_unit/metadata.h
+++ b/src/test_unit/metadata.h
@@ -19,6 +19,6 @@
 #ifndef FLAC__TEST_UNIT_METADATA_H
 #define FLAC__TEST_UNIT_METADATA_H
 
-int test_metadata(const char *progname);
+int test_metadata();
 
 #endif

diff --git a/test/test_unit.sh b/test/test_unit.sh
index 5f8f938..e0f198c 100755 (executable)
--- a/test/test_unit.sh
+++ b/test/test_unit.sh
@@ -20,11 +20,9 @@
 LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 PATH=../src/test_unit:../obj/bin:$PATH
+export PATH
 
-# We use the whole path to test_unit so it can find itself.  It uses it's own
-# binary as a dummy source for creating a test FLAC file so it can work on the
-# metadata.
-if `which test_unit` ; then : ; else
+if test_unit ; then : ; else
        echo "ERROR during test_unit" 1>&2
        exit 1
 fi