This is the mail archive of the mauve-patches@sourceware.org mailing list for the Mauve project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: RFC: update in batch_run


Tom Tromey a écrit :

>>>>>>"Olivier" == Olivier Jolly <olivier.jolly@pcedev.com> writes:
>>>>>>            
>>>>>>
>
>Olivier> So I added the ability to set the environnement variable
>Olivier> COMPILER to "none", which assumes that all .class are already
>Olivier> present.
>
>Looks pretty good to me.  Just one nit.
>
>Olivier>   If accepted, the batch_run wrapper in eclipse could be changed to
>Olivier> benefit of this optimisation.
>
>Sounds good.
>
>Olivier> +if test -z "$NATIVE" -a "x$COMPILER" != "xnone"; then
>
>It is a little more defensive to use &&:
>
>    if test -z foo && test blah != blah; then
>
>Maybe my old autoconf habits are showing... there were weird parsing
>problems with -a in some versions of test, back in ancient times.
>
>  
>
ok, no problem, I commited it with this change taken in account.

2006-02-14  Olivier Jolly  <olivier.jolly@pcedev.com>

    * batch_run
      (COMPILER): Added "none" as possible value to skip compilation.


>Tom
>  
>
Olivier
Index: batch_run
===================================================================
RCS file: /cvs/mauve/mauve/batch_run,v
retrieving revision 1.18
diff -u -r1.18 batch_run
--- batch_run	21 Dec 2005 15:07:19 -0000	1.18
+++ batch_run	14 Feb 2006 21:05:32 -0000
@@ -22,7 +22,8 @@
 
 # Tries to compile and run all possible tests.
 # Produces a FAIL output if compilation fails.
-# COMPILER command can be set in the script
+# COMPILER command can be set in the script or to "none" to avoid
+# cleaning .class files and recompiling them
 # For testing (gcj) native code compilation set NATIVE to 'true', otherwise
 # don't set it.
 # Uses runner script to run each individual test.
@@ -57,8 +58,11 @@
 NATIVE=
 fi
 
-# Cleanup
-find gnu/testlet -name "*.class" | xargs rm -f
+# Cleanup if COMPILER != none
+if test "x$COMPILER" != "xnone"; then
+	find gnu/testlet -name "*.class" | xargs rm -f
+fi
+
 if test ! -z "$NATIVE"; then
     rm -f SimpleTestHarness
 fi
@@ -66,7 +70,7 @@
 # Create Mauve Framwork
 framework_sources="gnu/testlet/SimpleTestHarness.java gnu/testlet/TestHarness.java gnu/testlet/Testlet.java gnu/testlet/ResourceNotFoundException.java gnu/testlet/TestSecurityManager.java gnu/testlet/config.java gnu/testlet/TestResult.java gnu/testlet/TestReport.java"
 
-if test -z "$NATIVE"; then
+if test -z "$NATIVE" && test "x$COMPILER" != "xnone"; then
     $COMPILER $COMPILER_FLAGS $framework_sources
 fi
 
@@ -110,7 +114,9 @@
 
     # Try to compile sources
     if test -z "$NATIVE"; then
-        $COMPILER $COMPILER_FLAGS @uses_files
+	if test "x$COMPILER" != "xnone"; then
+	       	$COMPILER $COMPILER_FLAGS @uses_files
+	fi
     else
         $COMPILER $COMPILER_FLAGS -o SimpleTestHarness --main=gnu.testlet.SimpleTestHarness \
 	          $framework_sources `cat uses_files`

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]