Skip to content

Commit 9abe3d7

Browse files
TheTaha-AlamineTheTaha-Alamine
committed
Remove unittest env variables
1 parent 1f185f5 commit 9abe3d7

File tree

12 files changed

+35
-87
lines changed

12 files changed

+35
-87
lines changed

Diff for: ‎ci.jsonnet

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# common
2-
local common = import 'common.json';
1+
# Common
32
local graal_common = import 'graal-common.json';
43

54
# Compiler

Diff for: ‎compiler/ci_common/gate.jsonnet

+8-16
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@
4141
timelimit: "1:30:00",
4242
},
4343

44-
# Configures env vars such that `mx unittest` persists results in a json file
45-
save_as_json:: {
46-
environment+: {
47-
"MX_TEST_RESULT_TAGS": "compiler"
48-
}
49-
},
50-
51-
5244
test:: s.base(no_warning_as_error=true),
5345

5446
coverage:: s.base("build,coverage", ["--jacoco-omit-excluded", "--jacocout", "html"]) + {
@@ -128,28 +120,28 @@
128120

129121
builds: [
130122
# Darwin AMD64
131-
{name: "gate-compiler-test-labsjdk-17-darwin-amd64"} + s.test + c.labsjdk17 + c.darwin_amd64 + t("1:00:00") + s.save_as_json + c.mach5_target,
123+
{name: "gate-compiler-test-labsjdk-17-darwin-amd64"} + s.test + c.labsjdk17 + c.darwin_amd64 + t("1:00:00") + c.mach5_target,
132124
{name: "weekly-compiler-test-labsjdk-11-darwin-amd64"} + s.test + c.labsjdk11 + c.darwin_amd64 + s.weekly,
133125

134126
# Darwin AArch64
135-
{name: "gate-compiler-test-labsjdk-17-darwin-aarch64"} + s.test + c.labsjdk17 + c.darwin_aarch64 + t("1:00:00") + s.save_as_json,
127+
{name: "gate-compiler-test-labsjdk-17-darwin-aarch64"} + s.test + c.labsjdk17 + c.darwin_aarch64 + t("1:00:00"),
136128
{name: "weekly-compiler-test-labsjdk-11-darwin-aarch64"} + s.test + c.labsjdk11 + c.darwin_aarch64 + s.weekly,
137129

138130
# Windows AMD64
139-
{name: "gate-compiler-test-labsjdk-11-windows-amd64"} + s.test + c.labsjdk11 + c.windows_amd64 + t("55:00") + c.devkits["windows-jdk11"] + s.save_as_json + c.mach5_target,
140-
{name: "gate-compiler-test-labsjdk-17-windows-amd64"} + s.test + c.labsjdk17 + c.windows_amd64 + t("55:00") + c.devkits["windows-jdk17"] + s.save_as_json + c.mach5_target,
131+
{name: "gate-compiler-test-labsjdk-11-windows-amd64"} + s.test + c.labsjdk11 + c.windows_amd64 + t("55:00") + c.devkits["windows-jdk11"] + c.mach5_target,
132+
{name: "gate-compiler-test-labsjdk-17-windows-amd64"} + s.test + c.labsjdk17 + c.windows_amd64 + t("55:00") + c.devkits["windows-jdk17"] + c.mach5_target,
141133

142134
# Linux AMD64
143-
{name: "gate-compiler-test-labsjdk-11-linux-amd64"} + s.test + c.labsjdk11 + c.linux_amd64 + t("55:00") + s.save_as_json + c.mach5_target,
144-
{name: "gate-compiler-test-labsjdk-17-linux-amd64"} + s.test + c.labsjdk17 + c.linux_amd64 + t("55:00") + s.save_as_json + c.mach5_target,
135+
{name: "gate-compiler-test-labsjdk-11-linux-amd64"} + s.test + c.labsjdk11 + c.linux_amd64 + t("55:00") + c.mach5_target,
136+
{name: "gate-compiler-test-labsjdk-17-linux-amd64"} + s.test + c.labsjdk17 + c.linux_amd64 + t("55:00") + c.mach5_target,
145137
{name: "gate-compiler-ctw-labsjdk-11-linux-amd64"} + s.ctw + c.labsjdk11 + c.linux_amd64 + c.mach5_target,
146138
{name: "gate-compiler-ctw-labsjdk-17-linux-amd64"} + s.ctw + c.labsjdk17 + c.linux_amd64 + c.mach5_target,
147139
{name: "gate-compiler-ctw-economy-labsjdk-11-linux-amd64"} + s.ctw_economy + c.labsjdk11 + c.linux_amd64,
148140
{name: "gate-compiler-ctw-economy-labsjdk-17-linux-amd64"} + s.ctw_economy + c.labsjdk17 + c.linux_amd64,
149141
{name: "gate-compiler-benchmarktest-labsjdk-11-linux-amd64"} + s.benchmark + c.labsjdk11 + c.linux_amd64,
150142
{name: "gate-compiler-benchmarktest-labsjdk-17-linux-amd64"} + s.benchmark + c.labsjdk17 + c.linux_amd64,
151143
{name: "gate-compiler-style-linux-amd64"} + s.style + c.labsjdk17 + c.linux_amd64 + t("45:00"),
152-
{name: "gate-compiler-test-truffle-xcomp-labsjdk-17-linux-amd64"} + s.truffle_xcomp + c.labsjdk17 + c.linux_amd64 + t("1:30:00") + s.save_as_json + {environment+: {"TRACE_COMPILATION": "true"}, logs+: ['*/*_compilation.log']},
144+
{name: "gate-compiler-test-truffle-xcomp-labsjdk-17-linux-amd64"} + s.truffle_xcomp + c.labsjdk17 + c.linux_amd64 + t("1:30:00") + {environment+: {"TRACE_COMPILATION": "true"}, logs+: ['*/*_compilation.log']},
153145
{name: "weekly-compiler-test-labsjdk-17-linux-amd64-vector16"} + s.test_vec16 + c.labsjdk17 + c.linux_amd64 + s.weekly,
154146
{name: "weekly-compiler-test-labsjdk-17-linux-amd64-avx0"} + s.test_avx0 + c.labsjdk17 + c.linux_amd64 + s.weekly,
155147
{name: "weekly-compiler-test-labsjdk-17-linux-amd64-avx1"} + s.test_avx1 + c.labsjdk17 + c.linux_amd64 + s.weekly,
@@ -161,7 +153,7 @@
161153
{name: "weekly-compiler-test-labsjdk-17-linux-amd64-fastdebug"} + s.test + c.labsjdk17Debug + c.linux_amd64 + s.weekly + t("3:00:00"),
162154

163155
# Linux AArch64
164-
{name: "gate-compiler-test-labsjdk-11-linux-aarch64"} + s.test + c.labsjdk11 + c.linux_aarch64 + t("1:50:00") + s.save_as_json,
156+
{name: "gate-compiler-test-labsjdk-11-linux-aarch64"} + s.test + c.labsjdk11 + c.linux_aarch64 + t("1:50:00"),
165157
{name: "gate-compiler-ctw-labsjdk-11-linux-aarch64"} + s.ctw + c.labsjdk11 + c.linux_aarch64 + t("1:50:00"),
166158
{name: "gate-compiler-ctw-economy-labsjdk-11-linux-aarch64"} + s.ctw_economy + c.labsjdk11 + c.linux_aarch64 + t("1:50:00"),
167159
{name: "weekly-compiler-coverage-labsjdk-11-linux-aarch64"} + s.coverage + c.labsjdk11 + c.linux_aarch64 + s.weekly + t("1:50:00"),

Diff for: ‎regex/ci.jsonnet

+1-7
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,9 @@
3232
targets: ["gate"],
3333
},
3434

35-
local regex_unittest = {
36-
environment+: {
37-
"MX_TEST_RESULT_TAGS": "regex"
38-
}
39-
},
40-
4135
builds: std.flattenArrays([
4236
[
43-
common.linux_amd64 + jdk + regex_gate + regex_unittest,
37+
common.linux_amd64 + jdk + regex_gate,
4438
common.linux_amd64 + jdk + regex_downstream_js,
4539
common.darwin_amd64 + jdk + regex_gate_lite,
4640
] for jdk in [

Diff for: ‎sdk/ci.jsonnet

+4-10
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,10 @@
1313
timelimit: "30:00",
1414
},
1515

16-
local sdk_unittest = {
17-
environment+: {
18-
"MX_TEST_RESULT_TAGS": "sdk"
19-
}
20-
},
21-
2216
builds: [
23-
common.linux_amd64 + common.oraclejdk11 + sdk_gate + common.eclipse + common.jdt + sdk_unittest + common.mach5_target,
24-
common.linux_amd64 + common.oraclejdk17 + sdk_gate + common.eclipse + common.jdt + sdk_unittest + common.mach5_target,
25-
common.darwin_amd64 + common.oraclejdk11 + sdk_gate + sdk_unittest + common.mach5_target,
26-
common.darwin_amd64 + common.oraclejdk17 + sdk_gate + sdk_unittest + common.mach5_target,
17+
common.linux_amd64 + common.oraclejdk11 + sdk_gate + common.eclipse + common.jdt + common.mach5_target,
18+
common.linux_amd64 + common.oraclejdk17 + sdk_gate + common.eclipse + common.jdt + common.mach5_target,
19+
common.darwin_amd64 + common.oraclejdk11 + sdk_gate + common.mach5_target,
20+
common.darwin_amd64 + common.oraclejdk17 + sdk_gate + common.mach5_target,
2721
]
2822
}

Diff for: ‎substratevm/ci.jsonnet

+6-12
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
setup+: [["git", "clone", "--depth", "1", ["mx", "urlrewrite", "https://github.com/graalvm/js-benchmarks.git"], "../../js-benchmarks"]],
1919
},
2020

21-
local svm_unittest = {
22-
environment+: {
23-
"MX_TEST_RESULT_TAGS": "native-image",
24-
},
25-
},
26-
2721
local gdb(version) = {
2822
downloads+: {
2923
GDB: {name: "gdb", version: version, platformspecific: true},
@@ -77,11 +71,11 @@
7771
linux_amd64_jdk17 + gate("js", "build,js") + clone_js_benchmarks + t("35:00"),
7872
darwin_jdk17 + gate("js", "build,js") + clone_js_benchmarks,
7973
darwin_jdk17 + gate("js-quickbuild", "build,js_quickbuild") + clone_js_benchmarks,
80-
linux_amd64_jdk11 + gate("build-ce", "build,checkstubs,helloworld,test,nativeimagehelp,muslcbuild,debuginfotest") + maven + svm_unittest + t("35:00") + musl_toolchain + gdb("10.2"),
81-
linux_amd64_jdk11 + gate("modules-basic", "build,hellomodule,test") + maven + svm_unittest + t("30:00"),
82-
linux_amd64_jdk17 + gate("style-fullbuild", "style,fullbuild,helloworld,test,svmjunit,debuginfotest") + common.eclipse + common.jdt + maven + jsonschema + svm_unittest + t("50:00") + mx_build_exploded + gdb("10.2"),
83-
linux_amd64_jdk19 + gate("basics", "build,helloworld,test,svmjunit") + svm_unittest + t("55:00"),
84-
windows_jdk17 + gate("basics", "build,helloworld,test,svmjunit") + svm_unittest + t("1:30:00"),
85-
windows_jdk17 + gate("basics-quickbuild", "build,helloworld_quickbuild,test_quickbuild,svmjunit_quickbuild") + svm_unittest + t("1:30:00"),
74+
linux_amd64_jdk11 + gate("build-ce", "build,checkstubs,helloworld,test,nativeimagehelp,muslcbuild,debuginfotest") + maven + t("35:00") + musl_toolchain + gdb("10.2"),
75+
linux_amd64_jdk11 + gate("modules-basic", "build,hellomodule,test") + maven + t("30:00"),
76+
linux_amd64_jdk17 + gate("style-fullbuild", "style,fullbuild,helloworld,test,svmjunit,debuginfotest") + common.eclipse + common.jdt + maven + jsonschema + t("50:00") + mx_build_exploded + gdb("10.2"),
77+
linux_amd64_jdk19 + gate("basics", "build,helloworld,test,svmjunit") + t("55:00"),
78+
windows_jdk17 + gate("basics", "build,helloworld,test,svmjunit") + t("1:30:00"),
79+
windows_jdk17 + gate("basics-quickbuild", "build,helloworld_quickbuild,test_quickbuild,svmjunit_quickbuild") + t("1:30:00"),
8680
],
8781
}

Diff for: ‎sulong/ci_common/sulong-common.jsonnet

-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
CLANG_LLVM_LINK: "llvm-link",
143143
CLANG_LLVM_DIS: "llvm-dis",
144144
CLANG_LLVM_OPT: "opt",
145-
MX_TEST_RESULT_TAGS: "sulong",
146145
},
147146
},
148147

Diff for: ‎tools/ci.jsonnet

+2-8
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,9 @@
6060
targets: ["weekly"],
6161
},
6262

63-
local tools_unittest = {
64-
environment+: {
65-
"MX_TEST_RESULT_TAGS": "tools"
66-
}
67-
},
68-
6963
builds: [
70-
common.linux_amd64 + common.oraclejdk11 + tools_gate + tools_unittest,
71-
common.linux_amd64 + common.oraclejdk17 + tools_gate + tools_unittest,
64+
common.linux_amd64 + common.oraclejdk11 + tools_gate,
65+
common.linux_amd64 + common.oraclejdk17 + tools_gate,
7266

7367
common.linux_amd64 + common.oraclejdk11 + tools_javadoc,
7468
common.linux_amd64 + common.oraclejdk17 + tools_coverage_weekly,

Diff for: ‎truffle/ci.jsonnet

+4-10
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@
2828
]
2929
},
3030

31-
local truffle_unittest = {
32-
environment+: {
33-
"MX_TEST_RESULT_TAGS": "truffle"
34-
}
35-
},
36-
37-
local gate_lite = truffle_common + truffle_unittest + {
31+
local gate_lite = truffle_common + {
3832
name: 'gate-truffle-mac-lite-oraclejdk-' + self.jdk_version,
3933
run: [
4034
["mx", "build"],
@@ -102,7 +96,7 @@
10296
],
10397
},
10498

105-
local truffle_gate = truffle_common + common.eclipse + common.jdt + truffle_unittest {
99+
local truffle_gate = truffle_common + common.eclipse + common.jdt {
106100
name: 'gate-truffle-oraclejdk-' + self.jdk_version,
107101
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
108102
},
@@ -128,7 +122,7 @@
128122
],
129123
},
130124

131-
truffle_common + linux_amd64 + common.oraclejdk11 + truffle_unittest {
125+
truffle_common + linux_amd64 + common.oraclejdk11 {
132126
name: "gate-truffle-slow-path-unittests",
133127
run: [
134128
["mx", "build", "-n", "-c", "-A-Atruffle.dsl.GenerateSlowPathOnly=true"],
@@ -139,7 +133,7 @@
139133
],
140134
},
141135

142-
truffle_common + windows_amd64 + common.oraclejdk11 + truffle_unittest + devkits["windows-jdk11"] +{
136+
truffle_common + windows_amd64 + common.oraclejdk11 + devkits["windows-jdk11"] +{
143137
name: "gate-truffle-nfi-windows-11",
144138
# TODO make that a full gate run
145139
# currently, some truffle unittests fail on windows

Diff for: ‎vm/ci_common/common.jsonnet

+3-3
Original file line numberDiff line numberDiff line change
@@ -691,15 +691,15 @@ local devkits = common_json.devkits;
691691
self.gate_vm_linux_amd64 + self.libgraal_compiler + vm.vm_java_11 + { name: 'gate-vm-libgraal-compiler-11-linux-amd64' },
692692
self.gate_vm_linux_amd64 + self.libgraal_compiler + vm.vm_java_17 + { name: 'gate-vm-libgraal-compiler-17-linux-amd64' },
693693

694-
self.gate_vm_linux_amd64 + self.libgraal_truffle + vm.vm_java_11 + vm.vm_unittest + { name: 'gate-vm-libgraal-truffle-11-linux-amd64' },
695-
self.gate_vm_linux_amd64 + self.libgraal_truffle + vm.vm_java_17 + vm.vm_unittest + { name: 'gate-vm-libgraal-truffle-17-linux-amd64' },
694+
self.gate_vm_linux_amd64 + self.libgraal_truffle + vm.vm_java_11 + { name: 'gate-vm-libgraal-truffle-11-linux-amd64' },
695+
self.gate_vm_linux_amd64 + self.libgraal_truffle + vm.vm_java_17 + { name: 'gate-vm-libgraal-truffle-17-linux-amd64' },
696696

697697
self.gate_vm_linux_amd64 + self.libgraal_compiler_quickbuild + vm.vm_java_17 + { name: 'gate-vm-libgraal-compiler-quickbuild-17-linux-amd64' },
698698
self.gate_vm_linux_amd64 + self.libgraal_truffle_quickbuild + vm.vm_java_17 + { name: 'gate-vm-libgraal-truffle-quickbuild-17-linux-amd64' },
699699

700700
self.gate_vm_linux_amd64 + self.libgraal_compiler_quickbuild + vm.vm_java_19 + { name: 'gate-vm-libgraal-compiler-quickbuild-19-linux-amd64' },
701701

702-
vm.vm_java_17 + self.svm_common_linux_amd64 + self.sulong_linux + vm.custom_vm_linux + self.gate_vm_linux_amd64 + vm.vm_unittest + {
702+
vm.vm_java_17 + self.svm_common_linux_amd64 + self.sulong_linux + vm.custom_vm_linux + self.gate_vm_linux_amd64 + {
703703
run: [
704704
['export', 'SVM_SUITE=' + vm.svm_suite],
705705
['mx', '--dynamicimports', '$SVM_SUITE,/sulong', '--disable-polyglot', '--disable-libpolyglot', 'gate', '--no-warning-as-error', '--tags', 'build,sulong'],

Diff for: ‎vm/ci_includes/vm.jsonnet

+2-8
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ local jdks = common_json.jdks;
6666
deploy:: self.mx_cmd_base + ['maven-deploy', '--only', self.native_distributions, '--tags=default', '--all-suites', '--all-distribution-types', '--validate', 'full', '--licenses', 'GPLv2-CPE,UPL,MIT'],
6767
},
6868

69-
vm_unittest:: {
70-
environment+: {
71-
MX_TEST_RESULT_TAGS: 'vm',
72-
},
73-
},
74-
7569
notify_releaser_build: vm_common.common_vm_linux + graal_common.linux_amd64 + {
7670
name: 'daily-vm-notify-releaser-build-linux-amd64',
7771
packages+: {
@@ -120,14 +114,14 @@ local jdks = common_json.jdks;
120114
},
121115

122116
local builds = [
123-
self.vm_java_11 + vm_common.gate_vm_linux_amd64 + self.vm_unittest + {
117+
self.vm_java_11 + vm_common.gate_vm_linux_amd64 + {
124118
run: [
125119
['mx', 'build'],
126120
['mx', 'unittest', '--suite', 'vm'],
127121
],
128122
name: 'gate-vm-unittest-linux-amd64',
129123
},
130-
self.vm_java_11 + common_json.devkits['windows-jdk11'] + vm_common.gate_vm_windows + self.vm_unittest + {
124+
self.vm_java_11 + common_json.devkits['windows-jdk11'] + vm_common.gate_vm_windows + {
131125
run: [
132126
['mx', 'build'],
133127
['mx', 'unittest', '--suite', 'vm'],

Diff for: ‎wasm/ci.jsonnet

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
builds: [
99
# Gates.
1010
common.jdk17_gate_linux_eclipse_jdt + common.gate_graalwasm + common.amd64 + {environment+: {GATE_TAGS: 'style,fullbuild'}} + {name: 'gate-graalwasm-style-fullbuild-linux-amd64'},
11-
common.jdk17_gate_linux_wabt + common.gate_graalwasm_full + common.amd64 + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest-linux-amd64'} + common.wasm_unittest,
12-
common.jdk17_gate_linux_wabt_emsdk + common.gate_graalwasm_emsdk_full + common.amd64 + {environment+: {GATE_TAGS: 'buildall,wasmextratest'}} + {name: 'gate-graalwasm-extra-unittest-linux-amd64'} + common.wasm_unittest,
11+
common.jdk17_gate_linux_wabt + common.gate_graalwasm_full + common.amd64 + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest-linux-amd64'},
12+
common.jdk17_gate_linux_wabt_emsdk + common.gate_graalwasm_emsdk_full + common.amd64 + {environment+: {GATE_TAGS: 'buildall,wasmextratest'}} + {name: 'gate-graalwasm-extra-unittest-linux-amd64'},
1313
common.jdk17_gate_linux_wabt_emsdk + common.gate_graalwasm_emsdk_full + common.amd64 + {environment+: {GATE_TAGS: 'buildall,wasmbenchtest'}} + {name: 'gate-graalwasm-benchtest-linux-amd64'},
14-
common.jdk17_gate_windows_wabt + common.gate_graalwasm_full + common.amd64 + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest-windows-amd64'} + common.devkits["windows-jdk17"] + common.wasm_unittest,
14+
common.jdk17_gate_windows_wabt + common.gate_graalwasm_full + common.amd64 + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest-windows-amd64'} + common.devkits["windows-jdk17"],
1515

16-
common.jdk11_gate_linux_wabt + common.gate_graalwasm_full + common.aarch64 + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest-11-linux-aarch64'} + common.wasm_unittest,
16+
common.jdk11_gate_linux_wabt + common.gate_graalwasm_full + common.aarch64 + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest-11-linux-aarch64'},
1717

1818
# Benchmark jobs.
1919
common.jdk17_bench_linux_wabt_emsdk + common.bench_graalwasm_emsdk_full + common.amd64 + {

Diff for: ‎wasm/ci_common/common.jsonnet

-6
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,6 @@ local graal_suite_root = root_ci.graal_suite_root;
167167
capabilities+: ['x52'],
168168
},
169169

170-
wasm_unittest: {
171-
environment+: {
172-
"MX_TEST_RESULT_TAGS": "wasm"
173-
}
174-
},
175-
176170
jdk17_gate_linux_eclipse_jdt : common.labsjdk17 + self.gate + self.linux + self.eclipse + self.jdt,
177171
jdk17_gate_linux_wabt : common.labsjdk17 + self.gate + self.linux + self.wabt,
178172
jdk17_gate_linux_wabt_emsdk : common.labsjdk17 + self.gate + self.linux + self.wabt + self.emsdk,

0 commit comments

Comments
 (0)