natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed error in file build.xml 

fixed IBM J9 related error in file test/clitest



git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@7415 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2006-05-12 16:27:50 +00:00
parent 8fcab6ea69
commit 5b5042e473
16 changed files with 253 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -26,7 +26,7 @@ PROPERTIES
<property name="test.dir" value="${basedir}/test"/>
<!-- Loads custom properties definitions -->
<property name="properties.file" value="${basedir}/build.properties"/>
<property file="${properties}"/>
<property file="${properties.file}"/>
<!-- Defines the product being built -->
<property name="copyright.string" value="copyright 2002-2006 LAMP EPFL"/>
<property name="number.file" value="${basedir}/build.number"/>

16
test/clitest
View File

@ -131,7 +131,8 @@ test_compile() {
info="$1"; shift 1;
[ -d "$OUTPUT_DIR" ] || mkdir -p $OUTPUT_DIR;
[ -f "$LOG_FILE" ] && rm $LOG_FILE;
if [ "$COMPILER" = "javac" ]; then
if [ "$COMPILER" = "javac" ] || [ "$COMPILER" = "jikes" ]; then
suffix=".${COMPILER}";
[ "$LANG" = "java5" ] && suffix=".${COMPILER}5";
[ "$LANG" = "java6" ] && suffix=".${COMPILER}6";
else
@ -329,9 +330,10 @@ if [ "$LANG" = "scala" ]; then
INTERPRETER_COMMAND="${BIN_DIR}scalaint"
SUFFIX=".scala"
elif [ "$LANG" = "java" ]; then
RUNTIME_COMMAND=`which java`
COMPILER_COMMAND=`which $COMPILER`
BIN_DIR=`dirname $COMPILER_COMMAND`
RUNTIME_COMMAND=`which ${JAVACMD:=java}`
BIN_DIR=`dirname $RUNTIME_COMMAND`;
[ "$COMPILER" = "javac" ] && COMPILER_COMMAND=$BIN_DIR/$COMPILER;
[ "$COMPILER" = "jikes" ] && COMPILER_COMMAND=`which $COMPILER`;
SUFFIX=".java"
else
abort "unknown language '$LANG'"
@ -347,8 +349,9 @@ printf_outline "Runtime command is : $RUNTIME_COMMAND\\n";
jvm_version=`${JAVACMD:=java} -version 2>&1 | head -3 | tail -1`
printf_outline "Java runtime is : $jvm_version\\n";
if [ "$LANG" = "java" ]; then
[ `echo "$jvm_version" | grep -c "J9"` = "1" ] && LANG="j9vm";
if [ "$LANG" = "scala" ]; then
[ `echo "$jvm_version" | grep -c "J9"` = "1" ] && LANG="${LANG}_j9";
elif [ "$LANG" = "java" ]; then
if [ "$COMPILER" = "jikes" ]; then
if [ "$LANG" = "java" ]; then
jre_home=`dirname $RUNTIME_COMMAND`/..;
@ -362,6 +365,7 @@ if [ "$LANG" = "java" ]; then
fi;
[ `echo "$jvm_version" | grep -c "1\.5"` = "1" ] && LANG="${LANG}5";
[ `echo "$jvm_version" | grep -c "1\.6"` = "1" ] && LANG="${LANG}6";
[ `echo "$jvm_version" | grep -c "J9"` = "1" ] && LANG="${LANG}_j9";
fi
if [ "$DEBUG" = "debug" ] ; then

6
test/files/cli/test1/Main.check.java Normal file
View File

@ -0,0 +1,6 @@
Unrecognized option: -cpp
Could not create the Java virtual machine.
1: test 1 passed (1)
1: test 2 passed (1)
1: test 3 passed (1)
1: test 4 passed (2)

4
test/files/cli/test1/Main.check.java5_j9 Normal file
View File

@ -0,0 +1,4 @@
env: -cpp: No such file or directory
env: test1.Main: No such file or directory
env: -cp: No such file or directory
1: test 3 passed

3
test/files/cli/test1/Main.check.jikes5 Normal file
View File

@ -0,0 +1,3 @@
Error: "-dd" is an invalid option.
use: jikes [options] [@files] file.java...
For more help, try -help or -version.

36
test/files/cli/test1/Main.check.scala_j9 Normal file
View File

@ -0,0 +1,36 @@
JVMJ9VM007E Command-line option unrecognised: -cpp
Could not create the Java virtual machine.
Usage: java [-options] class [args...]
(to execute a class)
or java [-jar] [-options] jarfile [args...]
(to execute a jar file)
where options include:
-cp -classpath <directories and zip/jar files separated by :>
set search path for application classes and resources
-D<name>=<value>
set a system property
-verbose[:class|gc|jni]
enable verbose output
-version print product version
-version:<value>
require the specified version to run
-showversion print product version and continue
-jre-restrict-search | -no-jre-restrict-search
include/exclude user private JREs in the version search
-agentlib:<libname>[=<options>]
load native agent library <libname>, e.g. -agentlib:hprof
see also, -agentlib:jdwp=help and -agentlib:hprof=help
-agentpath:<pathname>[=<options>]
load native agent library by full pathname
-javaagent:<jarpath>[=<options>]
load Java programming language agent, see java.lang.instrument
-? -help print this help message
-X print help on non-standard options
-assert print help on assert options
1: test 1 passed (1)
1: test 2 passed (1)
1: test 3 passed (1)
1: test 4 passed (4)

6
test/files/cli/test2/Main.check.java Normal file
View File

@ -0,0 +1,6 @@
Unrecognized option: -cpp
Could not create the Java virtual machine.
2: 1: test 1 passed (1)
2: 1: test 2 passed (1)
2: 1: test 3 passed (1)
2: 1: test 4 passed (2)

36
test/files/cli/test2/Main.check.java5_j9 Normal file
View File

@ -0,0 +1,36 @@
JVMJ9VM007E Command-line option unrecognised: -cpp
Could not create the Java virtual machine.
Usage: java [-options] class [args...]
(to execute a class)
or java [-jar] [-options] jarfile [args...]
(to execute a jar file)
where options include:
-cp -classpath <directories and zip/jar files separated by :>
set search path for application classes and resources
-D<name>=<value>
set a system property
-verbose[:class|gc|jni]
enable verbose output
-version print product version
-version:<value>
require the specified version to run
-showversion print product version and continue
-jre-restrict-search | -no-jre-restrict-search
include/exclude user private JREs in the version search
-agentlib:<libname>[=<options>]
load native agent library <libname>, e.g. -agentlib:hprof
see also, -agentlib:jdwp=help and -agentlib:hprof=help
-agentpath:<pathname>[=<options>]
load native agent library by full pathname
-javaagent:<jarpath>[=<options>]
load Java programming language agent, see java.lang.instrument
-? -help print this help message
-X print help on non-standard options
-assert print help on assert options
The java class is not found: test2.Main
The java class is not found: test2.Main
The java class is not found: test2.Main
The java class is not found: test2.Main

4
test/files/cli/test2/Main.check.javac
View File

@ -17,11 +17,11 @@ where possible options include:
-target <release> Generate class files for specific VM version
-help Print a synopsis of standard options
files/cli/test2/Main.java:5: package test1 does not exist
files/cli/test2/Main.java:6: package test1 does not exist
test1.Main.main(args);
^
1 error
files/cli/test2/Main.java:5: package test1 does not exist
files/cli/test2/Main.java:6: package test1 does not exist
test1.Main.main(args);
^
1 error

9
test/files/cli/test2/Main.check.jikes5 Normal file
View File

@ -0,0 +1,9 @@
Error: "-dd" is an invalid option.
use: jikes [options] [@files] file.java...
For more help, try -help or -version.
Found 1 semantic error compiling "files/cli/test2/Main.java":
6. test1.Main.main(args);
^---^
*** Semantic Error: No accessible field named "test1" was found in type "test2.Main".

36
test/files/cli/test2/Main.check.scala_j9 Normal file
View File

@ -0,0 +1,36 @@
JVMJ9VM007E Command-line option unrecognised: -cpp
Could not create the Java virtual machine.
Usage: java [-options] class [args...]
(to execute a class)
or java [-jar] [-options] jarfile [args...]
(to execute a jar file)
where options include:
-cp -classpath <directories and zip/jar files separated by :>
set search path for application classes and resources
-D<name>=<value>
set a system property
-verbose[:class|gc|jni]
enable verbose output
-version print product version
-version:<value>
require the specified version to run
-showversion print product version and continue
-jre-restrict-search | -no-jre-restrict-search
include/exclude user private JREs in the version search
-agentlib:<libname>[=<options>]
load native agent library <libname>, e.g. -agentlib:hprof
see also, -agentlib:jdwp=help and -agentlib:hprof=help
-agentpath:<pathname>[=<options>]
load native agent library by full pathname
-javaagent:<jarpath>[=<options>]
load Java programming language agent, see java.lang.instrument
-? -help print this help message
-X print help on non-standard options
-assert print help on assert options
2: 1: test 1 passed (1)
2: 1: test 2 passed (1)
2: 1: test 3 passed (1)
2: 1: test 4 passed (4)

10
test/files/cli/test3/Main.check.java Normal file
View File

@ -0,0 +1,10 @@
Unrecognized option: -cpp
Could not create the Java virtual machine.
3: 1: test 1 passed (1)
3: 2: 1: test 1 passed (1)
3: 1: test 2 passed (1)
3: 2: 1: test 2 passed (1)
3: 1: test 3 passed (1)
3: 2: 1: test 3 passed (1)
3: 1: test 4 passed (2)
3: 2: 1: test 4 passed (2)

36
test/files/cli/test3/Main.check.java5_j9 Normal file
View File

@ -0,0 +1,36 @@
JVMJ9VM007E Command-line option unrecognised: -cpp
Could not create the Java virtual machine.
Usage: java [-options] class [args...]
(to execute a class)
or java [-jar] [-options] jarfile [args...]
(to execute a jar file)
where options include:
-cp -classpath <directories and zip/jar files separated by :>
set search path for application classes and resources
-D<name>=<value>
set a system property
-verbose[:class|gc|jni]
enable verbose output
-version print product version
-version:<value>
require the specified version to run
-showversion print product version and continue
-jre-restrict-search | -no-jre-restrict-search
include/exclude user private JREs in the version search
-agentlib:<libname>[=<options>]
load native agent library <libname>, e.g. -agentlib:hprof
see also, -agentlib:jdwp=help and -agentlib:hprof=help
-agentpath:<pathname>[=<options>]
load native agent library by full pathname
-javaagent:<jarpath>[=<options>]
load Java programming language agent, see java.lang.instrument
-? -help print this help message
-X print help on non-standard options
-assert print help on assert options
The java class is not found: test3.Main
The java class is not found: test3.Main
The java class is not found: test3.Main
The java class is not found: test3.Main

8
test/files/cli/test3/Main.check.javac
View File

@ -17,17 +17,17 @@ where possible options include:
-target <release> Generate class files for specific VM version
-help Print a synopsis of standard options
files/cli/test3/Main.java:5: package test1 does not exist
files/cli/test3/Main.java:6: package test1 does not exist
test1.Main.main(args);
^
files/cli/test3/Main.java:7: package test2 does not exist
files/cli/test3/Main.java:8: package test2 does not exist
test2.Main.main(args);
^
2 errors
files/cli/test3/Main.java:5: package test1 does not exist
files/cli/test3/Main.java:6: package test1 does not exist
test1.Main.main(args);
^
files/cli/test3/Main.java:7: package test2 does not exist
files/cli/test3/Main.java:8: package test2 does not exist
test2.Main.main(args);
^
2 errors

14
test/files/cli/test3/Main.check.jikes5 Normal file
View File

@ -0,0 +1,14 @@
Error: "-dd" is an invalid option.
use: jikes [options] [@files] file.java...
For more help, try -help or -version.
Found 2 semantic errors compiling "files/cli/test3/Main.java":
6. test1.Main.main(args);
^---^
*** Semantic Error: No accessible field named "test1" was found in type "test3.Main".
8. test2.Main.main(args);
^---^
*** Semantic Error: No accessible field named "test2" was found in type "test3.Main".

40
test/files/cli/test3/Main.check.scala_j9 Normal file
View File

@ -0,0 +1,40 @@
JVMJ9VM007E Command-line option unrecognised: -cpp
Could not create the Java virtual machine.
Usage: java [-options] class [args...]
(to execute a class)
or java [-jar] [-options] jarfile [args...]
(to execute a jar file)
where options include:
-cp -classpath <directories and zip/jar files separated by :>
set search path for application classes and resources
-D<name>=<value>
set a system property
-verbose[:class|gc|jni]
enable verbose output
-version print product version
-version:<value>
require the specified version to run
-showversion print product version and continue
-jre-restrict-search | -no-jre-restrict-search
include/exclude user private JREs in the version search
-agentlib:<libname>[=<options>]
load native agent library <libname>, e.g. -agentlib:hprof
see also, -agentlib:jdwp=help and -agentlib:hprof=help
-agentpath:<pathname>[=<options>]
load native agent library by full pathname
-javaagent:<jarpath>[=<options>]
load Java programming language agent, see java.lang.instrument
-? -help print this help message
-X print help on non-standard options
-assert print help on assert options
3: 1: test 1 passed (1)
3: 2: 1: test 1 passed (1)
3: 1: test 2 passed (1)
3: 2: 1: test 2 passed (1)
3: 1: test 3 passed (1)
3: 2: 1: test 3 passed (1)
3: 1: test 4 passed (4)
3: 2: 1: test 4 passed (4)