Skip to content

fix: strip Java WARNING lines from golden files and regenerate error goldens #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenamar-db merged 1 commit into from
Jun 18, 2026
+22 −0
Merged

fix: strip Java WARNING lines from golden files and regenerate error goldens #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions sjsonnet/test/resources/refresh_golden_outputs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ if [ $# -gt 0 ]; then
fi

java $JAVA_OPTS -jar "$SJSONNET" $PARAMS $EXT_PARAMS $TLA_PARAMS "$f" > "$f.golden" 2>&1 || true
# Strip Java runtime WARNING lines (e.g. sun.misc.Unsafe deprecation)
sed -i '' '/^WARNING:/d' "$f.golden"
done
popd || exit 1
echo "Done refreshing specified golden outputs."
Expand All @@ -52,6 +54,8 @@ for f in *.jsonnet; do
fi

java $JAVA_OPTS -jar "$SJSONNET" $PARAMS $EXT_PARAMS $TLA_PARAMS "$f" > "$f.golden" 2>&1 || true
# Strip Java runtime WARNING lines (e.g. sun.misc.Unsafe deprecation)
sed -i '' '/^WARNING:/d' "$f.golden"
done
popd || exit 1

Expand All @@ -64,6 +68,8 @@ for f in *.jsonnet; do

echo " Processing file: $f"
java $JAVA_OPTS -jar "$SJSONNET" $PARAMS "$f" > "$f.golden" 2>&1 || true
# Strip Java runtime WARNING lines (e.g. sun.misc.Unsafe deprecation)
sed -i '' '/^WARNING:/d' "$f.golden"
done
popd || exit 1

Expand All @@ -76,6 +82,8 @@ for f in *.jsonnet; do

echo " Processing file: $f"
java $JAVA_OPTS -jar "$SJSONNET" $PARAMS "$f" > "$f.golden" 2>&1 || true
# Strip Java runtime WARNING lines (e.g. sun.misc.Unsafe deprecation)
sed -i '' '/^WARNING:/d' "$f.golden"
done
popd || exit 1

Expand Down
14 changes: 14 additions & 0 deletions sync_test_suites.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,13 @@ sync_test_files() {
if [ ! -e "$dest_file" ]; then
cp -r "$src_file" "$dest_file"
new_golden=$((new_golden + 1))
# If the new golden is an error output, regenerate with sjsonnet's error format
if ! is_success_golden "$src_file"; then
local jsonnet_file="$target_dir/${stem}.jsonnet"
if [ -f "$jsonnet_file" ]; then
echo "$jsonnet_file" >> "$GOLDEN_REFRESH_FILES"
fi
fi
elif ! diff -q "$src_file" "$dest_file" > /dev/null 2>&1; then
local src_ok=0 dest_ok=0
is_success_golden "$src_file" && src_ok=1
Expand Down Expand Up @@ -301,6 +308,13 @@ sync_test_files() {
if [ ! -e "$dest_file" ]; then
cp -r "$src_entry" "$dest_file"
new_golden=$((new_golden + 1))
# If the new golden is an error output, regenerate with sjsonnet's error format
if ! is_success_golden "$src_entry"; then
local local_jsonnet="$target_dir/${stem}.jsonnet"
if [ -f "$local_jsonnet" ]; then
echo "$local_jsonnet" >> "$GOLDEN_REFRESH_FILES"
fi
fi
elif ! diff -q "$src_entry" "$dest_file" > /dev/null 2>&1; then
local src_ok=0 dest_ok=0
is_success_golden "$src_entry" && src_ok=1
Expand Down
Loading