summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--configure.in1
-rwxr-xr-xtests/runtests.sh52
-rwxr-xr-xtests/runtests.sh.in7
8 files changed, 36 insertions, 54 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b233813..1e937cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 24 16:40:12 2003 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in tests/runtests.sh.in: Generate
+ runtest.sh so we can use ECHO_C, ECHO_N, SHELL
+ (#114944)
+
Thu Jul 24 15:55:31 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Clean up checks for usp10.h
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8b233813..1e937cf8 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Thu Jul 24 16:40:12 2003 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in tests/runtests.sh.in: Generate
+ runtest.sh so we can use ECHO_C, ECHO_N, SHELL
+ (#114944)
+
Thu Jul 24 15:55:31 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Clean up checks for usp10.h
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 8b233813..1e937cf8 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Thu Jul 24 16:40:12 2003 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in tests/runtests.sh.in: Generate
+ runtest.sh so we can use ECHO_C, ECHO_N, SHELL
+ (#114944)
+
Thu Jul 24 15:55:31 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Clean up checks for usp10.h
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 8b233813..1e937cf8 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Thu Jul 24 16:40:12 2003 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in tests/runtests.sh.in: Generate
+ runtest.sh so we can use ECHO_C, ECHO_N, SHELL
+ (#114944)
+
Thu Jul 24 15:55:31 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Clean up checks for usp10.h
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 8b233813..1e937cf8 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Thu Jul 24 16:40:12 2003 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in tests/runtests.sh.in: Generate
+ runtest.sh so we can use ECHO_C, ECHO_N, SHELL
+ (#114944)
+
Thu Jul 24 15:55:31 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Clean up checks for usp10.h
diff --git a/configure.in b/configure.in
index 62ad011a..a67551c4 100644
--- a/configure.in
+++ b/configure.in
@@ -682,6 +682,7 @@ docs/Makefile
docs/version.xml
tools/Makefile
tests/Makefile
+tests/runtests.sh
pango.pc
pangox.pc
pangowin32.pc
diff --git a/tests/runtests.sh b/tests/runtests.sh
deleted file mode 100755
index 897cd120..00000000
--- a/tests/runtests.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-LOGFILE=runtests.log
-POTENTIAL_TESTS='testboundaries testcolor'
-
-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 -n "Running test program \"$I\", please wait:"
- 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."
diff --git a/tests/runtests.sh.in b/tests/runtests.sh.in
index 897cd120..0c3466e2 100755
--- a/tests/runtests.sh.in
+++ b/tests/runtests.sh.in
@@ -1,8 +1,11 @@
-#! /bin/sh
+#! @SHELL@
LOGFILE=runtests.log
POTENTIAL_TESTS='testboundaries testcolor'
+ECHO_C='@ECHO_C@'
+ECHO_N='@ECHO_N@'
+
for I in $POTENTIAL_TESTS
do
GOOD=yes
@@ -32,7 +35,7 @@ echo "" >> $LOGFILE
for I in $TESTS
do
- echo -n "Running test program \"$I\", please wait:"
+ echo $ECHO_N "Running test program \"$I\", please wait:$ECHO_C"
echo "" >> $LOGFILE
echo "Output of $I:" >> $LOGFILE
if ./$I >>$LOGFILE 2>&1; then