diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2013-01-02 18:32:10 -0600 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2013-01-02 18:32:10 -0600 |
commit | 1cca32b775123f8f7bd5a2d4b3380e8d5bee13b0 (patch) | |
tree | b955febdfcfae9d5bba5006794d090c67bda4d71 | |
parent | d9a040b90362809aa675c74c57121850ff5697bb (diff) | |
download | fribidi-1cca32b775123f8f7bd5a2d4b3380e8d5bee13b0.tar.gz |
Fix test when EXEEXT is not empty
-rw-r--r-- | test/Makefile.am | 2 | ||||
-rwxr-xr-x | test/run.tests | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 8859f22..ad63fd9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,5 @@ -TESTS_ENVIRONMENT = /bin/sh +TESTS_ENVIRONMENT=srcdir=${srcdir} top_builddir=${top_builddir} EXEEXT=${EXEEXT} sh TESTS = run.tests diff --git a/test/run.tests b/test/run.tests index 295c4bd..65113dc 100755 --- a/test/run.tests +++ b/test/run.tests @@ -36,7 +36,7 @@ if test -z "$VERBOSE"; then exec > /dev/null 2>&1 fi -if ! test -f "$top_builddir/bin/fribidi"; then +if ! test -f "$top_builddir/bin/fribidi$EXEEXT"; then echo "run.tests: you must make fribidi first" exit 1 fi @@ -48,11 +48,11 @@ TEST () { charset="${testcase#*_}" charset="${charset%%_*}" echo -n "=== $test === " - if ! "$top_builddir/bin/fribidi" --charset "$charset" </dev/null >/dev/null 2>&1; then + if ! "$top_builddir/bin/fribidi$EXEEXT" --charset "$charset" </dev/null >/dev/null 2>&1; then echo " [Character set not supported]" return 0 fi - "$top_builddir/bin/fribidi" --test --charset "$charset" "$testcase" > "$test.output" + "$top_builddir/bin/fribidi$EXEEXT" --test --charset "$charset" "$testcase" > "$test.output" reference="${testcase%.input}.reference"; test -f "$reference" || reference="tests/${reference##*/}" |