From 6c100ab70bd411bfa74118817f1fb974a3b7252b Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 12 Sep 2007 15:27:41 +0000 Subject: [PATCH] Finalize the conversion of GRAS tests to TESH git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4603 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- configure | 63 ++++---------------------------- configure.ac | 2 - teshsuite/gras/trp_file_usage.in | 16 -------- teshsuite/gras/trp_tcp_usage | 18 --------- teshsuite/gras/trp_tcp_usage.in | 18 --------- 5 files changed, 8 insertions(+), 109 deletions(-) delete mode 100644 teshsuite/gras/trp_file_usage.in delete mode 100755 teshsuite/gras/trp_tcp_usage delete mode 100644 teshsuite/gras/trp_tcp_usage.in diff --git a/configure b/configure index 861090b008..1944cd8bf3 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.182 . +# From configure.ac Revision: 4581 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for simgrid 3.3-cvs. # @@ -26820,7 +26820,11 @@ ac_config_files="$ac_config_files tools/graspe-slave" # Testsuite -ac_config_files="$ac_config_files testsuite/Makefile testsuite/run_tests testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage" +ac_config_files="$ac_config_files testsuite/Makefile testsuite/run_tests" + + +# Teshsuite (testsuite using tesh) +ac_config_files="$ac_config_files teshsuite/Makefile" # Documentation @@ -26838,7 +26842,7 @@ ac_config_files="$ac_config_files examples/java/Makefile examples/java/basic/Mak fi -ac_config_files="$ac_config_files examples/Makefile examples/msg/Makefile examples/simdag/Makefile examples/simdag/test_simdag examples/gras/Makefile examples/gras/ping/Makefile examples/gras/rpc/Makefile examples/gras/spawn/Makefile examples/gras/synchro/Makefile examples/gras/timer/Makefile examples/gras/chrono/Makefile examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mmrpc/Makefile examples/gras/pmm/Makefile examples/gras/all2all/Makefile examples/amok/Makefile examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl examples/amok/saturate/Makefile examples/amok/saturate/test_sg examples/amok/saturate/test_rl" +ac_config_files="$ac_config_files examples/Makefile examples/msg/Makefile examples/simdag/Makefile examples/gras/Makefile examples/gras/ping/Makefile examples/gras/rpc/Makefile examples/gras/spawn/Makefile examples/gras/synchro/Makefile examples/gras/timer/Makefile examples/gras/chrono/Makefile examples/gras/mutual_exclusion/simple_token/Makefile examples/gras/mmrpc/Makefile examples/gras/pmm/Makefile examples/gras/all2all/Makefile examples/amok/Makefile examples/amok/bandwidth/Makefile examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl examples/amok/saturate/Makefile examples/amok/saturate/test_sg examples/amok/saturate/test_rl" ac_config_files="$ac_config_files src/smpi/smpicc src/smpi/smpirun" @@ -27519,8 +27523,7 @@ do "tools/graspe-slave") CONFIG_FILES="$CONFIG_FILES tools/graspe-slave" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "testsuite/run_tests") CONFIG_FILES="$CONFIG_FILES testsuite/run_tests" ;; - "testsuite/gras/trp_tcp_usage") CONFIG_FILES="$CONFIG_FILES testsuite/gras/trp_tcp_usage" ;; - "testsuite/gras/trp_file_usage") CONFIG_FILES="$CONFIG_FILES testsuite/gras/trp_file_usage" ;; + "teshsuite/Makefile") CONFIG_FILES="$CONFIG_FILES teshsuite/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; "examples/java/Makefile") CONFIG_FILES="$CONFIG_FILES examples/java/Makefile" ;; @@ -27531,7 +27534,6 @@ do "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/msg/Makefile") CONFIG_FILES="$CONFIG_FILES examples/msg/Makefile" ;; "examples/simdag/Makefile") CONFIG_FILES="$CONFIG_FILES examples/simdag/Makefile" ;; - "examples/simdag/test_simdag") CONFIG_FILES="$CONFIG_FILES examples/simdag/test_simdag" ;; "examples/gras/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/Makefile" ;; "examples/gras/ping/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/ping/Makefile" ;; "examples/gras/rpc/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gras/rpc/Makefile" ;; @@ -28390,7 +28392,6 @@ done "testsuite/Makefile":F) for file in \ testsuite/run_tests \ - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \ ; do \ test -e $file && chmod +x $file; \ done @@ -28398,23 +28399,6 @@ done "testsuite/run_tests":F) for file in \ testsuite/run_tests \ - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \ - ; do \ - test -e $file && chmod +x $file; \ - done - ;; - "testsuite/gras/trp_tcp_usage":F) - for file in \ - testsuite/run_tests \ - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \ - ; do \ - test -e $file && chmod +x $file; \ - done - ;; - "testsuite/gras/trp_file_usage":F) - for file in \ - testsuite/run_tests \ - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \ ; do \ test -e $file && chmod +x $file; \ done @@ -28422,7 +28406,6 @@ done "examples/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28432,7 +28415,6 @@ done "examples/msg/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28442,17 +28424,6 @@ done "examples/simdag/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ - examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ - examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ - ; do \ - test -e $file && chmod +x $file; \ - done - ;; - "examples/simdag/test_simdag":F) - for file in \ - \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28462,7 +28433,6 @@ done "examples/gras/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28472,7 +28442,6 @@ done "examples/gras/ping/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28482,7 +28451,6 @@ done "examples/gras/rpc/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28492,7 +28460,6 @@ done "examples/gras/spawn/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28502,7 +28469,6 @@ done "examples/gras/synchro/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28512,7 +28478,6 @@ done "examples/gras/timer/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28522,7 +28487,6 @@ done "examples/gras/chrono/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28532,7 +28496,6 @@ done "examples/gras/mutual_exclusion/simple_token/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28542,7 +28505,6 @@ done "examples/gras/mmrpc/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28552,7 +28514,6 @@ done "examples/gras/pmm/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28562,7 +28523,6 @@ done "examples/gras/all2all/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28572,7 +28532,6 @@ done "examples/amok/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28582,7 +28541,6 @@ done "examples/amok/bandwidth/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28592,7 +28550,6 @@ done "examples/amok/bandwidth/test_sg":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28602,7 +28559,6 @@ done "examples/amok/bandwidth/test_rl":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28612,7 +28568,6 @@ done "examples/amok/saturate/Makefile":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28622,7 +28577,6 @@ done "examples/amok/saturate/test_sg":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ @@ -28632,7 +28586,6 @@ done "examples/amok/saturate/test_rl":F) for file in \ \ - examples/simdag/test_simdag \ examples/amok/bandwidth/test_sg examples/amok/bandwidth/test_rl \ examples/amok/saturate/test_sg examples/amok/saturate/test_rl \ ; do \ diff --git a/configure.ac b/configure.ac index 5eccefaa4c..6ace0d8dda 100644 --- a/configure.ac +++ b/configure.ac @@ -460,11 +460,9 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ testsuite/Makefile testsuite/run_tests - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage ],[ for file in \ testsuite/run_tests \ - testsuite/gras/trp_tcp_usage testsuite/gras/trp_file_usage \ ; do \ test -e $file && chmod +x $file; \ done diff --git a/teshsuite/gras/trp_file_usage.in b/teshsuite/gras/trp_file_usage.in deleted file mode 100644 index e84d73ca08..0000000000 --- a/teshsuite/gras/trp_file_usage.in +++ /dev/null @@ -1,16 +0,0 @@ -#! @BASH@ -e - -if test -e gras/trp_file_server@EXEEXT@ ; then - base=gras -else - base=. -fi - -if [ x@EXEEXT@ = x ] ; then - wine= -else - wine=wine -fi - -$wine $base/trp_file_client@EXEEXT@ $@ | $wine $base/trp_file_server@EXEEXT@ $@ - diff --git a/teshsuite/gras/trp_tcp_usage b/teshsuite/gras/trp_tcp_usage deleted file mode 100755 index 674d04f3c6..0000000000 --- a/teshsuite/gras/trp_tcp_usage +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh -e - -if test -e gras/trp_tcp_server ; then - base=gras -else - base=. -fi - -if [ x = x ] ; then - wine= -else - wine=wine -fi - -$wine $base/trp_tcp_server $@ & -sleep 1 -$wine $base/trp_tcp_client $@ - diff --git a/teshsuite/gras/trp_tcp_usage.in b/teshsuite/gras/trp_tcp_usage.in deleted file mode 100644 index 089c427dc7..0000000000 --- a/teshsuite/gras/trp_tcp_usage.in +++ /dev/null @@ -1,18 +0,0 @@ -#! @BASH@ -e - -if test -e gras/trp_tcp_server@EXEEXT@ ; then - base=gras -else - base=. -fi - -if [ x@EXEEXT@ = x ] ; then - wine= -else - wine=wine -fi - -$wine $base/trp_tcp_server@EXEEXT@ $@ & -sleep 1 -$wine $base/trp_tcp_client@EXEEXT@ $@ - -- 2.20.1