Skip to content

Commit 33f1c58

Browse files
committed
Meta+Tests/LibGfx: Make check-jbig2-json.sh call compile.sh
That way, it picks up the recent speed-up in compile.sh. To make this work, let compile.sh optionally take the path to jbig2-from-json as first argument. Takes the time to run Meta/check-jbig2-json.sh from 1.7s to 0.29s on my system.
1 parent 7cd3e6e commit 33f1c58

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Meta/check-jbig2-json.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ if [ -z "${JBIG2_FROM_JSON_BINARY:-}" ] ; then
3333
JBIG2_FROM_JSON_BINARY="Build/lagom/bin/jbig2-from-json"
3434
fi
3535

36-
for f in "${json_files[@]}"; do
37-
f_jb2=Tests/LibGfx/test-inputs/jbig2/$(basename "${f%.json}.jbig2")
38-
"$JBIG2_FROM_JSON_BINARY" -o "$f_jb2" "$f"
39-
done
36+
Tests/LibGfx/test-inputs/jbig2/json/compile.sh "$JBIG2_FROM_JSON_BINARY"
4037

4138
# annex-h.jbig2 is fixed data from Annex H of the JBIG2 spec.
4239
# It should never change, if it does, that's a bug.

Tests/LibGfx/test-inputs/jbig2/json/compile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -u
55
DIR="$(cd "$(dirname "$0")" && pwd)"
66
ROOT="$DIR/../../../../.."
77
LAGOM_BUILD="$ROOT/Build/lagom"
8-
JBIG2_FROM_JSON="$LAGOM_BUILD/bin/jbig2-from-json"
8+
JBIG2_FROM_JSON=${1:-"$LAGOM_BUILD/bin/jbig2-from-json"}
99

1010
export DIR
1111
export JBIG2_FROM_JSON

0 commit comments

Comments
 (0)