[fU-cvs] libfunutil/toc/tests accept_license.sh,1.3,1.4 gnu_find.sh,1.2,1.3 lyxport.sh,1.3,1.4 qt_if_enabled.sh,1.3,1.4 testtemplate.sh,1.2,1.3 toc_core_tests.sh,1.6,1.7

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv30672/tests

Modified Files:
	accept_license.sh gnu_find.sh lyxport.sh qt_if_enabled.sh 
	testtemplate.sh toc_core_tests.sh 
Log Message:
a number of changes from the toc tree.

Index: accept_license.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/accept_license.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- accept_license.sh	29 Aug 2003 11:37:28 -0000	1.3
+++ accept_license.sh	30 Aug 2003 19:20:31 -0000	1.4
@@ -27,7 +27,7 @@
     echo "accept_license: could not find license file $lc."
     return 1
 }
-toc_boldecho -e "\tPLEASE READ THE LICENSE! PLEASE READ THE LICENSE! PLEASE READ THE LICENSE!"
+toc_boldecho -e "\tPLEASE READ THE LICENSE!"
 test "x${accept_license-0}" = "x0" && {
     echo "You are going to be shown a license (file: $lc), after which you will be asked whether you accept the license or not."
     echo "Tap ENTER to continue."; read

Index: gnu_find.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gnu_find.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnu_find.sh	26 Aug 2003 08:31:28 -0000	1.2
+++ gnu_find.sh	30 Aug 2003 19:20:31 -0000	1.3
@@ -1,4 +1,4 @@
-# tests for GNU find
+# toc_run_description = search for GNU find
 
 
 toc_find_failok find || return 1

Index: lyxport.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/lyxport.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lyxport.sh	26 Aug 2003 08:31:28 -0000	1.3
+++ lyxport.sh	30 Aug 2003 19:20:31 -0000	1.4
@@ -20,8 +20,7 @@
 configure_with_lyxport=${configure_with_lyxport-0}
 path=${PATH}:${TOC_TOCDIR}/bin
 toc_find_failok lyxport $path || {
-    echo "lyxport not found $path"
-    echo "You can possibly find lyxport at http://www-hep.colorado.edu/~fperez/lyxport"
+    echo "lyxport not found. You can possibly find lyxport at http://www-hep.colorado.edu/~fperez/lyxport"
     return 1
 }
 lyxport=${TOC_FIND_RESULT}

Index: qt_if_enabled.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/qt_if_enabled.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt_if_enabled.sh	26 Aug 2003 08:31:28 -0000	1.3
+++ qt_if_enabled.sh	30 Aug 2003 19:20:31 -0000	1.4
@@ -27,7 +27,7 @@
 qt_required_version=${qt_required_version-'3.x'}
 qt_required_version_glob=${qt_required_version_glob-'3.*'}
 
-toc_source_test qt || {
+toc_source_test qt $@ || {
     err=$?
     echo "Qt $qt_required_version not found."
     return $err

Index: testtemplate.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/testtemplate.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- testtemplate.sh	28 Aug 2003 09:29:43 -0000	1.2
+++ testtemplate.sh	30 Aug 2003 19:20:31 -0000	1.3
@@ -43,4 +43,11 @@
 toc_find_fail ls
 toc_add_make MY_OPTION='my value'
 
+#echo 'echo nested test "$@"' > footest.sh
+#echo 'toc_run_failok footest.sh boogle bar' > bartest.sh
+#toc_run_failok bartest.sh
+#rm bartest.sh footest.sh
+
+
 echo "this test will fail now."; return 1
+

Index: toc_core_tests.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/toc_core_tests.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- toc_core_tests.sh	29 Aug 2003 08:47:26 -0000	1.6
+++ toc_core_tests.sh	30 Aug 2003 19:20:31 -0000	1.7
@@ -1,3 +1,4 @@
+# toc_run_description = core sanity checks
 # to be sourced from toc_core.sh
 # This is the core sanity checker for toc. Any test which MUST
 # pass for a tree to be considered toc-capable may be placed
@@ -56,6 +57,8 @@
     toc_find_failok $f
     toc_add_make $v=${TOC_FIND_RESULT}
 done
+
+toc_run running_under_cygwin
 
 toc_boldecho -n "Core configure checks completed. "
 echo ${TOC_EMOTICON_OKAY}