[Dacapobench-commits] SF.net SVN: dacapobench: [203] benchmarks/trunk/benchmarks

[<ste...@us...>]

Revision: 203
          http://svn.sourceforge.net/dacapobench/?rev=203&view=rev
Author:   steveb-oss
Date:     2006-10-19 15:11:43 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Minor aesthetic improvements to usage notes.  Whitespace change to build.xml

Modified Paths:
--------------
    benchmarks/trunk/benchmarks/build.xml
    benchmarks/trunk/benchmarks/src/dacapo/TestHarness.java

Modified: benchmarks/trunk/benchmarks/build.xml
===================================================================
--- benchmarks/trunk/benchmarks/build.xml	2006-10-19 21:47:44 UTC (rev 202)
+++ benchmarks/trunk/benchmarks/build.xml	2006-10-19 22:11:43 UTC (rev 203)
@@ -1186,9 +1186,7 @@
 		<unjar src="${xalan-top}/xalan-j_${xalan-v}/build/xalan.jar" dest="${build}"/>
 
 		<!-- Add the stub sun.io classes to the build -->
-		<javac srcdir="${stub}" destdir="${build}" 
-			includes="sun/io/*"
-		       debug="true" debuglevel="lines,vars,source"/>
+		<javac srcdir="${stub}" destdir="${build}" includes="sun/io/*" debug="true" debuglevel="lines,vars,source"/>
 	</target>
 	<!-- Copy a stand-alone xalan jar into the build -->
 	<target name="xalan.jar" depends="xalan.benchmark" description="put a standalone xalan jar into the jar">

Modified: benchmarks/trunk/benchmarks/src/dacapo/TestHarness.java
===================================================================
--- benchmarks/trunk/benchmarks/src/dacapo/TestHarness.java	2006-10-19 21:47:44 UTC (rev 202)
+++ benchmarks/trunk/benchmarks/src/dacapo/TestHarness.java	2006-10-19 22:11:43 UTC (rev 203)
@@ -118,8 +118,7 @@
         if (args[i].equals("-s")) {
           // size name name
           if (i == args.length - 1) {
-            System.err.println("No size specified!");
-            printUsage();
+            System.err.println("No size specified! (\"-h\" for usage)");
             System.exit(10);    	  
           }
           size = args[++i];
@@ -134,8 +133,7 @@
         } else if (args[i].equals("-c")) {
           // use a callback
           if (i == args.length - 1) {
-            System.err.println("No callback class specified!");
-            printUsage();
+            System.err.println("No callback class specified! (\"-h\" for usage)");
             System.exit(11);    	  
           }
           Class cls = null;
@@ -154,8 +152,7 @@
           }
         } else if (args[i].equals("-n")) {          // Run n times, showing the last iteration
           if (i == args.length - 1) {
-            System.err.println("Number of iterations not specified!");
-            printUsage();
+            System.err.println("Number of iterations not specified! (\"-h\" for usage)");
             System.exit(14);    	  
           }
           iterations = Integer.parseInt(args[++i]);
@@ -163,22 +160,19 @@
           converge = true;
         } else if (args[i].equals("-max_iterations")) { // Max iterations for convergence
           if (i == args.length - 1) {
-            System.err.println("No max specified!");
-            printUsage();
+            System.err.println("No max specified! (\"-h\" for usage)");
             System.exit(15);    	  
           }
           max_iterations = Integer.parseInt(args[++i]);
         } else if (args[i].equals("-variance")) {   // Coeff. of variance to aim for
           if (i == args.length - 1) {
-            System.err.println("No variance specified!");
-            printUsage();
+            System.err.println("No variance specified! (\"-h\" for usage)");
             System.exit(16);    	  
           }
           target_var = Double.parseDouble(args[++i])/100.0;
         } else if (args[i].equals("-window")) {     // # iterations to average convergence over
           if (i == args.length - 1) {
-            System.err.println("No window size specified!");
-            printUsage();
+            System.err.println("No window size specified!  (\"-h\" for usage)");
             System.exit(17);    	  
           }
           window = Integer.parseInt(args[++i]);
@@ -194,19 +188,18 @@
           Benchmark.enableValidationReport(args[++i]);
         } else if (args[i].equals("-scratch")) {
           if (i == args.length - 1) {
-            System.err.println("No scratch directory specified!");
-            printUsage();
+            System.err.println("No scratch directory specified! (\"-h\" for usage)");
             System.exit(18);    	  
           }
           scratchDir = args[++i];
         } else {
-          System.err.println("Unrecognized option "+args[i]);
+          System.err.println("Unrecognized option "+args[i]+ " (\"-h\" for usage)");
           System.exit(1);
         }
       }
       
       if (i == args.length) {
-          System.err.println("No benchmarks specified!");
+          System.err.println("No benchmarks specified! (\"-h\" for usage)");
           System.exit(19);    	  
       }
       


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