Skip to content

Commit dbbb8d0

Browse files
Baltolirv-jenkins
andauthored
Don't invoke Maven every time we run a test (#1067)
Previously, the testing script would invoke Maven every time it compiled a pattern-matching tree; this was slow and made the CI process prone to intermittent network failures. This PR addresses the issue by instead directly invoking the compiled JAR file that we already built with Maven. Fixes #1055 Co-authored-by: rv-jenkins <[email protected]>
1 parent 1a34fdd commit dbbb8d0

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

bin/llvm-kompile-testing

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,17 @@ trap 'rm -rf "$dt_dir"' INT TERM EXIT
1111
definition=$(realpath "$1")
1212
mode="$2"
1313
shift; shift
14-
( cd "@PROJECT_SOURCE_DIR@"/matching && mvn exec:java -Dexec.args="$definition qbaL $dt_dir 1" -q )
14+
15+
matching_dir="@PROJECT_SOURCE_DIR@/matching"
16+
installed_jar="$matching_dir/target/llvm-backend-matching-1.0-SNAPSHOT-jar-with-dependencies.jar"
17+
18+
if [ ! -f "$installed_jar" ]; then
19+
echo "Pattern matching compiler isn't installed!"
20+
echo " looking for a jar file at $installed_jar"
21+
exit 1
22+
fi
23+
24+
java -jar "$installed_jar" "$definition" qbaL "$dt_dir" 1
1525

1626
llvm_kompile_flags=()
1727
clang_flags=()

nix/overlay.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ let
4545
mkdir -p "$out/bin"
4646
cp ${llvm-backend.src}/bin/llvm-kompile-testing "$out/bin"
4747
sed -i "$out/bin/llvm-kompile-testing" \
48-
-e '/@PROJECT_SOURCE_DIR@/ c ${java} -jar ${jar} $definition qbaL $dt_dir 1'
48+
-e 's!installed_jar=.*!installed_jar="${jar}"!g'
4949
substituteInPlace $out/bin/llvm-kompile-testing \
50-
--replace 'llvm-kompile' '${llvm-backend}/bin/llvm-kompile'
50+
--replace 'llvm-kompile' '${llvm-backend}/bin/llvm-kompile' \
51+
--replace 'java -jar "$installed_jar" "$definition" qbaL "$dt_dir" 1' \
52+
'${java} -jar "$installed_jar" "$definition" qbaL "$dt_dir" 1'
5153
chmod +x "$out/bin/llvm-kompile-testing"
5254
patchShebangs "$out/bin/llvm-kompile-testing"
5355
'';

0 commit comments

Comments
 (0)