mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 11:04:34 +02:00
8048594: The sjavac client/server protocol should be hidden behind an interface
Reviewed-by: jfranck
This commit is contained in:
Andreas Lundblad
parent
ce0935812b
commit
8baafcf7ef
17 changed files with 697 additions and 459 deletions
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
import java.util.*;
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.nio.file.*;
|
||||
import java.nio.file.attribute.*;
|
||||
import java.nio.charset.*;
|
||||
|
|
@ -43,6 +42,9 @@ class SJavac {
|
|||
}
|
||||
|
||||
FileSystem defaultfs = FileSystems.getDefault();
|
||||
String serverArg = "--server:"
|
||||
+ "portfile=testportfile,"
|
||||
+ "background=false";
|
||||
|
||||
// Where to put generated sources that will
|
||||
// test aspects of sjavac, ie JTWork/scratch/gensrc
|
||||
|
|
@ -136,7 +138,7 @@ class SJavac {
|
|||
"private int b() { return A.DEFINITION; } native void foo(); }");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
previous_bin_state = collectState(bin);
|
||||
previous_headers_state = collectState(headers);
|
||||
}
|
||||
|
|
@ -145,7 +147,7 @@ class SJavac {
|
|||
System.out.println("\nTesting that no change in sources implies no change in binaries.");
|
||||
System.out.println("------------------------------------------------------------------");
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyEqual(new_bin_state, previous_bin_state);
|
||||
Map<String,Long> new_headers_state = collectState(headers);
|
||||
|
|
@ -158,7 +160,7 @@ class SJavac {
|
|||
System.out.println("-----------------------------------------");
|
||||
removeFrom(gensrc, "alfa/omega/AA.java");
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyThatFilesHaveBeenRemoved(previous_bin_state, new_bin_state,
|
||||
"bin/alfa/omega/AA$1.class",
|
||||
|
|
@ -185,7 +187,7 @@ class SJavac {
|
|||
"public final static int DEFINITION = 18; public void aint() { } private void foo() { } }");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
|
||||
verifyNewerFiles(previous_bin_state, new_bin_state,
|
||||
|
|
@ -211,7 +213,7 @@ class SJavac {
|
|||
"private int b() { return A.DEFINITION; } }");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyNewerFiles(previous_bin_state, new_bin_state,
|
||||
"bin/beta/B.class",
|
||||
|
|
@ -236,7 +238,7 @@ class SJavac {
|
|||
"@java.lang.annotation.Native final static int alfa = 42; }");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyNewerFiles(previous_bin_state, new_bin_state,
|
||||
"bin/beta/B.class",
|
||||
|
|
@ -262,7 +264,7 @@ class SJavac {
|
|||
"@java.lang.annotation.Native final static int alfa = 43; }");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyNewerFiles(previous_bin_state, new_bin_state,
|
||||
"bin/beta/B.class",
|
||||
|
|
@ -299,7 +301,7 @@ class SJavac {
|
|||
"package beta; public class B { }");
|
||||
|
||||
compile("-x", "beta", "gensrc", "gensrc2", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false");
|
||||
serverArg);
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
|
||||
"bin/alfa/omega/A.class",
|
||||
|
|
@ -310,7 +312,7 @@ class SJavac {
|
|||
System.out.println("----- Compile with exluded beta went well!");
|
||||
delete(bin);
|
||||
compileExpectFailure("gensrc", "gensrc2", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false");
|
||||
serverArg);
|
||||
|
||||
System.out.println("----- Compile without exluded beta failed, as expected! Good!");
|
||||
delete(bin);
|
||||
|
|
@ -341,7 +343,7 @@ class SJavac {
|
|||
|
||||
compile("gensrc", "-x", "beta", "-sourcepath", "gensrc2",
|
||||
"-sourcepath", "gensrc3", "-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false");
|
||||
serverArg);
|
||||
|
||||
System.out.println("The first compile went well!");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
|
|
@ -353,7 +355,7 @@ class SJavac {
|
|||
delete(bin);
|
||||
compileExpectFailure("gensrc", "-sourcepath", "gensrc2", "-sourcepath", "gensrc3",
|
||||
"-d", "bin", "-h", "headers", "-j", "1",
|
||||
"--server:portfile=testserver,background=false");
|
||||
serverArg);
|
||||
|
||||
System.out.println("----- Compile without exluded beta failed, as expected! Good!");
|
||||
delete(bin);
|
||||
|
|
@ -378,7 +380,7 @@ class SJavac {
|
|||
"package gamma; public class C { alfa.omega.A a; }");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "3",
|
||||
"--server:portfile=testserver,background=false","--log=debug");
|
||||
serverArg,"--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
|
||||
"bin/alfa/omega/A.class",
|
||||
|
|
@ -407,7 +409,7 @@ class SJavac {
|
|||
"package beta; public class B { }");
|
||||
|
||||
compile("-x", "beta", "-src", "gensrc", "-x", "alfa/omega", "-sourcepath", "gensrc",
|
||||
"-d", "bin", "--server:portfile=testserver,background=false");
|
||||
"-d", "bin", serverArg);
|
||||
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
|
||||
|
|
@ -431,7 +433,7 @@ class SJavac {
|
|||
"}");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> previous_bin_state = collectState(bin);
|
||||
|
||||
// Change pubapi of A, this should trigger a recompile of B.
|
||||
|
|
@ -443,7 +445,7 @@ class SJavac {
|
|||
"}");
|
||||
|
||||
compile("gensrc", "-d", "bin", "-j", "1",
|
||||
"--server:portfile=testserver,background=false", "--log=debug");
|
||||
serverArg, "--log=debug");
|
||||
Map<String,Long> new_bin_state = collectState(bin);
|
||||
|
||||
verifyNewerFiles(previous_bin_state, new_bin_state,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue