[Nice-commit] Nice/src/nice/tools/testsuite TestNice.java,1.22,1.23 TestCase.java,1.21,1.22

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

Update of /cvsroot/nice/Nice/src/nice/tools/testsuite
In directory sc8-pr-cvs1:/tmp/cvs-serv2683/src/nice/tools/testsuite

Modified Files:
	TestNice.java TestCase.java 
Log Message:
Allow the Nice runtime to be specified on the command line (useful for running
a natively compiled version of the testsuite and compiler).


Index: TestNice.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/testsuite/TestNice.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TestNice.java	18 Mar 2003 09:40:50 -0000	1.22
--- TestNice.java	25 Apr 2003 11:52:18 -0000	1.23
***************
*** 147,150 ****
--- 147,161 ----
  
  
+ 	/**
+ 	 * Classpath entry that contains the Nice standard library.
+ 	 * 
+ 	 * This is only needed when the testsuite is not run from a JVM
+    * (for instance after native compilation), or if the standard library
+ 	 * is not in the classpath.
+ 	 * 
+ 	 */
+ 	private static String _runtime;
+ 
+ 
  
  	/**
***************
*** 200,203 ****
--- 211,216 ----
  				else if ("-comment".equalsIgnoreCase(s))
  					_writeComments = true;
+ 				else if ("-runtime".equalsIgnoreCase(s))
+ 					_runtime = args[i++];
  				else
  					return false;
***************
*** 425,428 ****
--- 438,450 ----
  	static boolean getWriteComments() {
  		return _writeComments;
+ 	}
+ 
+ 
+ 	/**
+ 	 * Returns the runtime, where the Nice standard library is.
+ 	 * 
+ 	 */
+ 	static String getRuntime() {
+ 		return _runtime;
  	}
  

Index: TestCase.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/testsuite/TestCase.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TestCase.java	8 Apr 2003 13:56:21 -0000	1.21
--- TestCase.java	25 Apr 2003 11:52:18 -0000	1.22
***************
*** 329,332 ****
--- 329,333 ----
  	  compilation.sourcePath = tempDir;
  	  compilation.destinationDir = tempDir;
+ 	  compilation.runtimeFile = TestNice.getRuntime();
  	  return nice.tools.compiler.fun.compile
  	    (compilation, packageName, null, null, false);