Address review.

github · Aug 29, 2024 · dd7f757 · dd7f757
1 parent ab56e63
commit dd7f757
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/java/ql/integration-tests/all-platforms/java/multi-release-jar-java11/test.py b/java/ql/integration-tests/all-platforms/java/multi-release-jar-java11/test.py
@@ -2,22 +2,9 @@
 
 
 def test(codeql, use_java_11, java):
-    commands.run(["javac", "mod1/module-info.java", "mod1/mod1pkg/Mod1Class.java", "-d", "mod1obj"])
     commands.run(
-        [
-            "jar",
-            "-c",
-            "-f",
-            "mod1.jar",
-            "-C",
-            "mod1obj",
-            "mod1pkg/Mod1Class.class",
-            "--release",
-            "9",
-            "-C",
-            "mod1obj",
-            "module-info.class",
-        ]
+        "javac mod1/module-info.java mod1/mod1pkg/Mod1Class.java -d mod1obj",
+        "jar -c -f mod1.jar -C mod1obj mod1pkg/Mod1Class.class --release 9 -C mod1obj module-info.class",
     )
     codeql.database.create(
         command="javac mod2/mod2pkg/User.java mod2/module-info.java -d mod2obj -p mod1.jar"

diff --git a/java/ql/integration-tests/all-platforms/java/multi-release-jar-java17/test.py b/java/ql/integration-tests/all-platforms/java/multi-release-jar-java17/test.py
@@ -2,22 +2,9 @@
 
 
 def test(codeql, java):
-    commands.run(["javac", "mod1/module-info.java", "mod1/mod1pkg/Mod1Class.java", "-d", "mod1obj"])
     commands.run(
-        [
-            "jar",
-            "-c",
-            "-f",
-            "mod1.jar",
-            "-C",
-            "mod1obj",
-            "mod1pkg/Mod1Class.class",
-            "--release",
-            "9",
-            "-C",
-            "mod1obj",
-            "module-info.class",
-        ]
+        "javac mod1/module-info.java mod1/mod1pkg/Mod1Class.java -d mod1obj",
+        "jar -c -f mod1.jar -C mod1obj mod1pkg/Mod1Class.class --release 9 -C mod1obj module-info.class",
     )
     codeql.database.create(
         command="javac mod2/mod2pkg/User.java mod2/module-info.java -d mod2obj -p mod1.jar"