diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-06-11 12:31:14 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-06-13 19:15:10 +0100 |
| commit | 52d398a84197053a624c13a0bc1cfb78df996966 (patch) | |
| tree | d65ee1085e8111e36abc2f1d42b1400de1434d61 /java/sdk_test.go | |
| parent | 250e6198d45d7d29bea4c121d42afc8cb6a672d9 (diff) | |
Add sdk_version:"none" to replace no_standard_libs:true
Where possible this duplicates any tests that use no_standard_libs:true
with ones that use sdk_version:"none". If not possible (e.g. in the
default targets included in java/testing.go) it switches some to use
sdk_version:"none" to ensure that there is no regression in the
behavior of no_standard_libs:true.
Follow up changes will switch all usages of no_standard_libs:true over
to use sdk_version:"none" at which point no_standard_libs will be
removed.
Bug: 134566750
Test: m droid
Change-Id: I5f0fd3daa980f6b223abe454cba7f25a97a39d7a
Diffstat (limited to 'java/sdk_test.go')
| -rw-r--r-- | java/sdk_test.go | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index 23d7a98be..1efe83b74 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -113,7 +113,7 @@ func TestClasspath(t *testing.T) { }, { - name: "nostdlib", + name: "nostdlib - no_standard_libs: true", properties: `no_standard_libs: true, system_modules: "none"`, system: "none", bootclasspath: []string{`""`}, @@ -121,7 +121,15 @@ func TestClasspath(t *testing.T) { }, { - name: "nostdlib system_modules", + name: "nostdlib", + properties: `sdk_version: "none", system_modules: "none"`, + system: "none", + bootclasspath: []string{`""`}, + classpath: []string{}, + }, + { + + name: "nostdlib system_modules - no_standard_libs: true", properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`, system: "core-platform-api-stubs-system-modules", bootclasspath: []string{`""`}, @@ -129,6 +137,14 @@ func TestClasspath(t *testing.T) { }, { + name: "nostdlib system_modules", + properties: `sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules"`, + system: "core-platform-api-stubs-system-modules", + bootclasspath: []string{`""`}, + classpath: []string{}, + }, + { + name: "host default", moduleType: "java_library_host", properties: ``, @@ -145,12 +161,18 @@ func TestClasspath(t *testing.T) { bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"}, }, { - name: "host supported nostdlib", + name: "host supported nostdlib - no_standard_libs: true", host: android.Host, properties: `host_supported: true, no_standard_libs: true, system_modules: "none"`, classpath: []string{}, }, { + name: "host supported nostdlib", + host: android.Host, + properties: `host_supported: true, sdk_version: "none", system_modules: "none"`, + classpath: []string{}, + }, + { name: "unbundled sdk v25", unbundled: true, |