[Nice-commit] tester Project,1.11,1.12 Regression.test,1.1,1.2 Testsuite.test,1.1,1.2 gcj.test,1.3,1.4 run,1.16,1.17

[Artem Gr K. <ar...@us...>]

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

Modified Files:
	Project Regression.test Testsuite.test gcj.test run 
Log Message:
Support Ant compilation undler FreeBSD toolchain.


Index: Testsuite.test
===================================================================
RCS file: /cvsroot/nice/tester/Testsuite.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Testsuite.test	7 May 2004 08:54:37 -0000	1.1
--- Testsuite.test	1 Apr 2005 15:09:15 -0000	1.2
***************
*** 3,7 ****
  cd Nice
  
! /usr/bin/time -o TIME make check > OUT
  RES=$?
  
--- 3,11 ----
  cd Nice
  
! if [ "$ANT_BOOTSTRAP" ]; then
!   /usr/bin/time -o TIME ant check > OUT
! else
!   /usr/bin/time -o TIME make check > OUT
! fi
  RES=$?
  
***************
*** 11,15 ****
  NUM_PREFIX="number of testcases: "
  NUM=`tail -10 OUT | grep "$NUM_PREFIX"`
! NUM=`expr match "$NUM" "$NUM_PREFIX"'\(.*\)'`
  
  echo num_tests $NUM time `cat TIME` > ../METRICS
--- 15,19 ----
  NUM_PREFIX="number of testcases: "
  NUM=`tail -10 OUT | grep "$NUM_PREFIX"`
! NUM=`expr "$NUM" : "$NUM_PREFIX"'\(.*\)'`
  
  echo num_tests $NUM time `cat TIME` > ../METRICS

Index: Regression.test
===================================================================
RCS file: /cvsroot/nice/tester/Regression.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Regression.test	7 May 2004 08:54:37 -0000	1.1
--- Regression.test	1 Apr 2005 15:09:15 -0000	1.2
***************
*** 11,15 ****
  #NUM_PREFIX="number of testcases: "
  #NUM=`tail -10 OUT | grep "$NUM_PREFIX"`
! #NUM=`expr match "$NUM" "$NUM_PREFIX"'\(.*\)'`
  
  echo time `cat TIME` > ../METRICS
--- 11,15 ----
  #NUM_PREFIX="number of testcases: "
  #NUM=`tail -10 OUT | grep "$NUM_PREFIX"`
! #NUM=`expr "$NUM" : "$NUM_PREFIX"'\(.*\)'`
  
  echo time `cat TIME` > ../METRICS

Index: Project
===================================================================
RCS file: /cvsroot/nice/tester/Project,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Project	7 Sep 2004 12:19:29 -0000	1.11
--- Project	1 Apr 2005 15:09:15 -0000	1.12
***************
*** 9,12 ****
--- 9,19 ----
  fi
  
+ if [ "$ANT_BOOTSTRAP" ]; then
+   mkdir -p Nice/share/java
+   cp Nice/external/nice-bootstrap.jar Nice/share/java/nice.jar
+   cd Nice && ant jar
+   exit 0
+ fi
+ 
  # In benchmark mode, don't run the testsuite
  if [ "$CVS_DATE" ]; then

Index: run
===================================================================
RCS file: /cvsroot/nice/tester/run,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** run	31 Mar 2005 07:29:26 -0000	1.16
--- run	1 Apr 2005 15:09:16 -0000	1.17
***************
*** 52,56 ****
  
  for conffile in ../config.*; do
!     name="`expr match $conffile '../config\.\(.*\)'`"
  
      # Blank the variable, so it does not keep the previous value if it
--- 52,56 ----
  
  for conffile in ../config.*; do
!     name="`expr $conffile : '../config\.\(.*\)'`"
  
      # Blank the variable, so it does not keep the previous value if it
***************
*** 80,84 ****
  
      for test in ../*.test; do
! 	testname="`expr match $test '../\(.*\)\.test'`"
  	echo "<a name='$testname'>"
  	echo ""
--- 80,84 ----
  
      for test in ../*.test; do
! 	testname="`expr $test : '../\(.*\)\.test'`"
  	echo "<a name='$testname'>"
  	echo ""

Index: gcj.test
===================================================================
RCS file: /cvsroot/nice/tester/gcj.test,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gcj.test	30 Mar 2005 21:02:41 -0000	1.3
--- gcj.test	1 Apr 2005 15:09:16 -0000	1.4
***************
*** 14,18 ****
  NUM_PREFIX="  regressions: "
  NUM=`tail -10 OUT | grep "$NUM_PREFIX"`
! NUM=`expr match "$NUM" "$NUM_PREFIX"'\(.*\)'`
  
  # Number of errors is encoded as 10+number (since smaller numbers have
--- 14,18 ----
  NUM_PREFIX="  regressions: "
  NUM=`tail -10 OUT | grep "$NUM_PREFIX"`
! NUM=`expr "$NUM" : "$NUM_PREFIX"'\(.*\)'`
  
  # Number of errors is encoded as 10+number (since smaller numbers have