[Swig-cvs] SF.net SVN: swig:[11522] trunk/Examples

[<wsf...@us...>]

Revision: 11522
          http://swig.svn.sourceforge.net/swig/?rev=11522&view=rev
Author:   wsfulton
Date:     2009-08-09 22:39:51 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
remove unnecessary extra shells being spawned in the test-suite

Modified Paths:
--------------
    trunk/Examples/Makefile.in
    trunk/Examples/test-suite/allegrocl/Makefile.in
    trunk/Examples/test-suite/cffi/Makefile.in
    trunk/Examples/test-suite/chicken/Makefile.in
    trunk/Examples/test-suite/clisp/Makefile.in
    trunk/Examples/test-suite/csharp/Makefile.in
    trunk/Examples/test-suite/guile/Makefile.in
    trunk/Examples/test-suite/guilescm/Makefile.in
    trunk/Examples/test-suite/java/Makefile.in
    trunk/Examples/test-suite/lua/Makefile.in
    trunk/Examples/test-suite/mzscheme/Makefile.in
    trunk/Examples/test-suite/ocaml/Makefile.in
    trunk/Examples/test-suite/octave/Makefile.in
    trunk/Examples/test-suite/perl5/Makefile.in
    trunk/Examples/test-suite/php/Makefile.in
    trunk/Examples/test-suite/pike/Makefile.in
    trunk/Examples/test-suite/python/Makefile.in
    trunk/Examples/test-suite/r/Makefile.in
    trunk/Examples/test-suite/ruby/Makefile.in
    trunk/Examples/test-suite/tcl/Makefile.in
    trunk/Examples/test-suite/uffi/Makefile.in

Modified: trunk/Examples/Makefile.in
===================================================================
--- trunk/Examples/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -318,7 +318,7 @@
 	rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@
-	if [ -f runme.py ]; then (rm -f runme3.py runme3.py.bak;) fi;
+	if [ -f runme.py ]; then rm -f runme3.py runme3.py.bak; fi;
 
 
 ##################################################################

Modified: trunk/Examples/test-suite/allegrocl/Makefile.in
===================================================================
--- trunk/Examples/test-suite/allegrocl/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/allegrocl/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -114,8 +114,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.lisp appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(ALLEGROCLBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(ALLEGROCLBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 %.clean:

Modified: trunk/Examples/test-suite/cffi/Makefile.in
===================================================================
--- trunk/Examples/test-suite/cffi/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/cffi/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -38,8 +38,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.lisp appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CFFIBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CFFIBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean: (does nothing, we dont generate extra cffi code)

Modified: trunk/Examples/test-suite/chicken/Makefile.in
===================================================================
--- trunk/Examples/test-suite/chicken/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/chicken/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -43,24 +43,24 @@
 	$(setup)
 	+$(swig_and_compile_cpp)
 	$(run_testcase)
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \
-	  $(MAKE) $*.cppproxy; ) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then \
+	  $(MAKE) $*.cppproxy; \
 	fi;
 
 %.ctest:
 	$(setup)
 	+$(swig_and_compile_c)
 	$(run_testcase)
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \
-	  $(MAKE) $*.cproxy; ) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then \
+	  $(MAKE) $*.cproxy; \
 	fi;
 
 %.multicpptest: 
 	$(setup)
 	+$(swig_and_compile_multi_cpp)
 	$(run_testcase)
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \
-	  $(MAKE) $*.multiproxy; ) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then \
+	  $(MAKE) $*.multiproxy; \
 	fi;
 
 %.externaltest:
@@ -86,8 +86,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CHICKEN_CSI) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CHICKEN_CSI) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean

Modified: trunk/Examples/test-suite/clisp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/clisp/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/clisp/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -38,8 +38,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.lisp appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CLISPBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CLISPBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean: (does nothing, we dont generate extra clisp code)

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -59,30 +59,30 @@
 	  echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ;		  \
 	fi;								  \
 	if [ ! -d $* ]; then						  \
-		mkdir $*;						  \
+	  mkdir $*;							  \
 	fi;
 
 # Compiles C# files then runs the testcase. A testcase is only run if
 # a file is found which has _runme.cs appended after the testcase name.
 # Note C# uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows and SHLIB_PATH on HPUX.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
 	  CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` \
 	  $*$(CSHARPPATHSEPARATOR)*.cs' csharp_compile && \
-	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; ) \
-	else ( \
+	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; \
+	else \
 	  cd $* && \
 	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \
-	  CSHARPSRCS='*.cs' csharp_compile; ); \
+	  CSHARPSRCS='*.cs' csharp_compile && cd .. ; \
 	fi;
 
 # Clean: remove testcase directories
 %.clean:
 	@if [ -d $* ]; then \
-		rm -rf $*; \
+	  rm -rf $*; \
 	fi;
 
 clean:

Modified: trunk/Examples/test-suite/guile/Makefile.in
===================================================================
--- trunk/Examples/test-suite/guile/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/guile/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -44,8 +44,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean

Modified: trunk/Examples/test-suite/guilescm/Makefile.in
===================================================================
--- trunk/Examples/test-suite/guilescm/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/guilescm/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -19,8 +19,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 setup = \
@@ -44,6 +44,6 @@
 	fi;
 
 local_run_testcase = \
-	if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$*$(SCRIPTSUFFIX); \
 	fi;

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/java/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -67,23 +67,23 @@
 	  echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ;		  \
 	fi;								  \
 	if [ ! -d $* ]; then						  \
-		mkdir $*;						  \
+	  mkdir $*;							  \
 	fi;
 
 # Compiles java files then runs the testcase. A testcase is only run if
 # a file is found which has _runme.java appended after the testcase name.
 # Note Java uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows, SHLIB_PATH on HPUX and DYLD_LIBRARY_PATH on Mac OS X.
 run_testcase = \
-	(cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java) && \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  $(COMPILETOOL) $(JAVAC) -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && 	  \
-	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*_runme;) \
+	cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java && cd .. && \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  $(COMPILETOOL) $(JAVAC) -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
+	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*_runme; \
 	fi;
 
 # Clean: remove testcase directories
 %.clean:
 	@if [ -d $* ]; then \
-		rm -rf $*; \
+	  rm -rf $*; \
 	fi;
 
 clean:

Modified: trunk/Examples/test-suite/lua/Makefile.in
===================================================================
--- trunk/Examples/test-suite/lua/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/lua/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -46,8 +46,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.lua appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(LUA) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(LUA) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean: (does nothing, we dont generate extra lua code)

Modified: trunk/Examples/test-suite/mzscheme/Makefile.in
===================================================================
--- trunk/Examples/test-suite/mzscheme/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/mzscheme/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -36,8 +36,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(MZSCHEME) -r $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(MZSCHEME) -r $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean

Modified: trunk/Examples/test-suite/ocaml/Makefile.in
===================================================================
--- trunk/Examples/test-suite/ocaml/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/ocaml/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -14,13 +14,13 @@
 
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -a \
-	     -f $(top_srcdir)/Examples/test-suite/$*.list ] ; then ( \
+	     -f $(top_srcdir)/Examples/test-suite/$*.list ] ; then \
 		$(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
-		$(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& $(RUNTOOL) ./runme) ; \
-	elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
+		$(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme `cat $(top_srcdir)/Examples/test-suite/$(*).list | sed -e 's/\(.*\)/\1_wrap.o \1.cmo/g'`&& $(RUNTOOL) ./runme; \
+	elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 		$(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 		$(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme $(srcdir)/$(*).cmo $(srcdir)/$(*)_runme.cmo $(srcdir)/$(*)_wrap.o && \
-		$(RUNTOOL) ./runme) ; \
+		$(RUNTOOL) ./runme; \
 	fi ; 
 
 check_quant:

Modified: trunk/Examples/test-suite/octave/Makefile.in
===================================================================
--- trunk/Examples/test-suite/octave/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/octave/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -56,8 +56,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.m appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVEPATH=$(srcdir):OCTAVEPATH $(RUNTOOL) $(OCTAVE) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVEPATH=$(srcdir):OCTAVEPATH $(RUNTOOL) $(OCTAVE) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean: remove the generated .m file

Modified: trunk/Examples/test-suite/perl5/Makefile.in
===================================================================
--- trunk/Examples/test-suite/perl5/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/perl5/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -49,8 +49,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.pl appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PERL) $(TEST_RUNNER) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ; ) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PERL) $(TEST_RUNNER) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi; \
 
 

Modified: trunk/Examples/test-suite/php/Makefile.in
===================================================================
--- trunk/Examples/test-suite/php/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/php/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -47,10 +47,10 @@
 # Runs the testcase. Tries to run testcase_runme.php, and if that's not
 # found, runs testcase.php, except for multicpptests.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run;) \
-	elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*.php -a ! -f $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list ]; then ( \
-	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*.php RUNTOOL=$(RUNTOOL) php_run;) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run; \
+	elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*.php -a ! -f $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list ]; then \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*.php RUNTOOL=$(RUNTOOL) php_run; \
 	fi;
 
 # Clean: remove the generated .php file

Modified: trunk/Examples/test-suite/pike/Makefile.in
===================================================================
--- trunk/Examples/test-suite/pike/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/pike/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -36,8 +36,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.pike appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PIKE) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PIKE) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean: remove the generated .pike file

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/python/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -125,16 +125,15 @@
 
 ifeq (,$(PY3))
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  $(run_python);)\
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  $(run_python);\
 	fi;
 else
 run_testcase = \
-	if [ -f $(py2_runme) ]; then (	  \
-	  $(MAKE) -f $(srcdir)/Makefile $(py3_runme) && \
-	   $(run_python);) \
-        elif [ -f $(py3_runme) ]; then (   \
-          $(run_python);)  \
+	if [ -f $(py2_runme) ]; then \
+	  $(MAKE) -f $(srcdir)/Makefile $(py3_runme) && $(run_python); \
+        elif [ -f $(py3_runme) ]; then \
+          $(run_python); \
 	fi;
 endif
 
@@ -143,7 +142,7 @@
 	@rm -f hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py
 	@rm -f $*.py;
 	@#We only remove the _runme3.py if it is generated by 2to3 from a _runme.py.
-	@if [ -f $(py2_runme) ]; then (rm -f $(py3_runme) $(py3_runme).bak;) fi;
+	@if [ -f $(py2_runme) ]; then rm -f $(py3_runme) $(py3_runme).bak; fi;
 
 clean:
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile python_clean

Modified: trunk/Examples/test-suite/r/Makefile.in
===================================================================
--- trunk/Examples/test-suite/r/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/r/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -42,20 +42,19 @@
 # Run the runme if it exists.  If not just load the R wrapper to 
 # check for syntactic correctness
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \
-               $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ;) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	else \
-	  ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \
+	  $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX); \
 	fi;
 
 run_multitestcase = \
 	for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ]; then ( \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ]; then \
 	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \
-               $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ;) \
+               $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX); \
 	else \
-	  ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \
+	  $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX); \
 	fi; \
 	done
 # Clean
@@ -64,10 +63,10 @@
 
 %.clean:
 	@rm -f $*.R $*_wrap.so $*_wrap.cpp $*_wrap.c $*_wrap.o $*_runme.Rout $*.Rout
-	@if [ -f  $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list ]; then ( \
+	@if [ -f  $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list ]; then \
 	for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
 	   rm -f $${f}.R $${f}.Rout ; \
-	done ) \
+	done \
 	fi
 
 

Modified: trunk/Examples/test-suite/ruby/Makefile.in
===================================================================
--- trunk/Examples/test-suite/ruby/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/ruby/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -60,8 +60,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.rb appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(RUBY) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(RUBY) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean

Modified: trunk/Examples/test-suite/tcl/Makefile.in
===================================================================
--- trunk/Examples/test-suite/tcl/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/tcl/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -45,8 +45,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.tcl appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(TCLSH) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(TCLSH) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean

Modified: trunk/Examples/test-suite/uffi/Makefile.in
===================================================================
--- trunk/Examples/test-suite/uffi/Makefile.in	2009-08-09 14:51:22 UTC (rev 11521)
+++ trunk/Examples/test-suite/uffi/Makefile.in	2009-08-09 22:39:51 UTC (rev 11522)
@@ -38,8 +38,8 @@
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.lisp appended after the testcase name.
 run_testcase = \
-	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(UFFIBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(UFFIBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi;
 
 # Clean: (does nothing, we dont generate extra uffi code)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.