summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2012-12-02 17:43:09 +0200
committerBehdad Esfahbod <behdad@behdad.org>2012-12-02 18:09:40 +0200
commit49dfd2cfb00fe42e81c7aafee07eaa48a55edaae (patch)
tree9f6227d53e3bc8e91eec7b5ae677f6f4d29dc108
parent1b5ff16fcbcf4d43cad74b28f0dc63244f2b578c (diff)
downloadpango-49dfd2cfb00fe42e81c7aafee07eaa48a55edaae.tar.gz
Remove runtests.sh
-rw-r--r--configure.ac3
-rw-r--r--tests/Makefile.am8
-rwxr-xr-xtests/runtests.sh.in55
3 files changed, 3 insertions, 63 deletions
diff --git a/configure.ac b/configure.ac
index 8fe61e23..540603ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -933,9 +933,6 @@ pango-zip.sh
config.h.win32
])
-AC_CONFIG_FILES([tests/runtests.sh],
- [chmod +x tests/runtests.sh])
-
AC_OUTPUT
backends=""
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f483ec5..a7109367 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,10 @@
## Process this file with automake to create Makefile.in.
EXTRA_DIST = \
- all-unicode.txt \
- boundaries.utf8 \
- runtests.sh
+ boundaries.utf8
CLEANFILES = pangorc
-DISTCLEANFILES = all-unicode.txt runtests.log
+DISTCLEANFILES = all-unicode.txt
INCLUDES = \
-I$(top_srcdir) \
@@ -34,7 +32,7 @@ endif
if CROSS_COMPILING
TESTS=
else
-TESTS=runtests.sh
+TESTS=$(check_PROGRAMS)
endif
TESTS_ENVIRONMENT = \
diff --git a/tests/runtests.sh.in b/tests/runtests.sh.in
deleted file mode 100755
index a6d60007..00000000
--- a/tests/runtests.sh.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#! @SHELL@
-
-LOGFILE=runtests.log
-POTENTIAL_TESTS='testboundaries testcolor testboundaries_ucd'
-
-ECHO_C='@ECHO_C@'
-ECHO_N='@ECHO_N@'
-
-for I in $POTENTIAL_TESTS
-do
- GOOD=yes
- test -f $I || {
- echo "WARNING: test program $I not found, not running"
- GOOD=no
- }
-
- if test x$GOOD = xyes; then
- test -x $I || {
- echo "WARNING: test program $I is not executable, not running"
- GOOD=no
- }
- fi
-
- if test x$GOOD = xyes; then
- TESTS="$TESTS$I "
- fi
-done
-
-echo "Logging to $LOGFILE"
-
-echo "Log file for Pango test programs." > $LOGFILE
-echo "" >> $LOGFILE
-echo "Tests are: "$TESTS >> $LOGFILE
-echo "" >> $LOGFILE
-
-for I in $TESTS
-do
- echo $ECHO_N "Running test program \"$I\", please wait:$ECHO_C"
- echo "" >> $LOGFILE
- echo "Output of $I:" >> $LOGFILE
- if ./$I >>$LOGFILE 2>&1; then
- echo " passed"
- else
- echo
- echo
- echo '***'
- echo " Test failed: $I"
- echo " See $LOGFILE for errors"
- echo
- exit 1
- fi
-done
-
-echo
-echo "All tests passed."