[Nice-commit] tester Project,1.14,1.15 Testsuite.test,1.4,1.5 run,1.17,1.18

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/tester
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18478

Modified Files:
	Project Testsuite.test run 
Log Message:
Support for experimental JVMs (do not prevent the update of the dev version on failure) and for setting the JAVA and JAVAC commands explicitely

Index: Testsuite.test
===================================================================
RCS file: /cvsroot/nice/tester/Testsuite.test,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Testsuite.test	6 May 2005 07:24:10 -0000	1.4
--- Testsuite.test	31 May 2005 07:18:24 -0000	1.5
***************
*** 6,10 ****
    /usr/bin/time -o TIME ant check > OUT
  else
!   /usr/bin/time -o TIME make check > OUT
  fi
  RES=$?
--- 6,10 ----
    /usr/bin/time -o TIME ant check > OUT
  else
!   /usr/bin/time -o TIME make java="${JAVA:-java}" check > OUT
  fi
  RES=$?

Index: Project
===================================================================
RCS file: /cvsroot/nice/tester/Project,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Project	6 May 2005 07:24:10 -0000	1.14
--- Project	31 May 2005 07:18:24 -0000	1.15
***************
*** 21,24 ****
    cd Nice && make
  else
!   cd Nice && make fixpoint && cp share/java/nice.jar external/nice-bootstrap.jar && make fixpoint && make nicedoc archive
  fi
--- 21,24 ----
    cd Nice && make
  else
!   cd Nice && make fixpoint java="${JAVA:-java}" javac="${JAVAC:-javac}" && cp share/java/nice.jar external/nice-bootstrap.jar && make fixpoint java="${JAVA:-java}" javac="${JAVAC:-javac}" && make nicedoc archive java="${JAVA:-java}"
  fi

Index: run
===================================================================
RCS file: /cvsroot/nice/tester/run,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** run	1 Apr 2005 15:09:16 -0000	1.17
--- run	31 May 2005 07:18:24 -0000	1.18
***************
*** 57,60 ****
--- 57,61 ----
      # is not reset to a new value.
      JDK_VERSION=
+     experimental_jvm=false
  
      . $conffile
***************
*** 104,110 ****
  	    case "$code" in
  		0) echo "OK"         ;;
! 		1) echo "FAILURE"    ; failed=true ;;
! 		2) echo "WARN"       ;;
  		3) echo "IMPOSSIBLE" ;;
  		8) echo "SKIP"       ;;
  		*) echo "$((code-10))"      ;;
--- 105,112 ----
  	    case "$code" in
  		0) echo "OK"         ;;
! # make exits with 2 on errors
! 		1|2) echo "FAILURE"  ; [ "$experimental_jvm" != true ] && failed=true ;;
  		3) echo "IMPOSSIBLE" ;;
+ #		4) echo "WARN"       ;;
  		8) echo "SKIP"       ;;
  		*) echo "$((code-10))"      ;;