Edited to use local JAR for building runtime tests

ctjlewis · ctjlewis · commit 76cc3fbd906c · 2020-07-26T13:46:05.000-05:00
diff --git a/package.json b/package.json
@@ -15,9 +15,13 @@
     "jsdom": "^16.3.0"
   },
   "scripts": {
+    "build": "mvn -DskipTests",
+    "build:fast": "mvn -DskipTests -pl externs/pom.xml,pom-main.xml,pom-main-shaded.xml",
     "build:runtime_tests": "./utils/runtime_tests_build.sh",
+    "clean": "mvn clean",
     "run:jest": "jest --testRegex .*/utils/js/.* --verbose=true",
     "run:runtime_tests": "./utils/runtime_tests_run.sh",
-    "runtime_tests": "npm run --silent build:runtime_tests && npm run --silent run:runtime_tests"
+    "runtime_tests": "npm run --silent build:runtime_tests && npm run --silent run:runtime_tests",
+    "test": "mvn test"
   }
 }
diff --git a/utils/build.sh b/utils/build.sh
diff --git a/utils/runtime_tests_build.sh b/utils/runtime_tests_build.sh
@@ -15,13 +15,18 @@
 
 #!/bin/bash
 
-echo -e "\nBuilding runtime tests..."
-
 # to translate from relative dir
 abs_dirname() {
   echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
 }
 
+LOCAL_COMPILER=$(dirname ..)/target/closure-compiler-1.0-SNAPSHOT.jar
+echo $LOCAL_COMPILER
+if [ ! -f "$LOCAL_COMPILER" ]; then
+  echo -e "\nCompiler JAR not built. Building...\n" && yarn build:fast
+fi
+
+echo -e "\nBuilding runtime tests..."
 TEST_DIR="test/com/google/javascript/jscomp/runtime_tests"
 
 if [ -z $1 ]; then
@@ -49,15 +54,18 @@ compileRuntimeTests(){
 <head>
 <title>$TEST_NAME</title>
 <script defer>
-$(google-closure-compiler \
-  --language_in ES_NEXT \
-  --language_out NO_TRANSPILE \
-  --process_common_js_modules \
-  --module_resolution NODE \
-  --dependency_mode PRUNE \
-  --js node_modules/google-closure-library/ \
-  --js $ABS_PATH/ \
-  --entry_point $FILE)
+$(
+  java -server -XX:+TieredCompilation \
+    -jar $LOCAL_COMPILER \
+    --language_in ES_NEXT \
+    --language_out NO_TRANSPILE \
+    --process_common_js_modules \
+    --module_resolution NODE \
+    --dependency_mode PRUNE \
+    --js node_modules/google-closure-library/ \
+    --js $ABS_PATH/ \
+    --entry_point $FILE
+)
 </script>
 </head>
 </html>" > $TEST_LOC/build/$TEST_NAME.html
@@ -66,4 +74,6 @@ $(google-closure-compiler \
 }
 
 # build tests
-compileRuntimeTests $(find $ABS_PATH -type f -name '*_test.js')
+time(
+  compileRuntimeTests $(find $ABS_PATH -type f -name '*_test.js')
+)
