diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-11-01 10:33:53 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-11-01 21:23:35 -0500 |
| commit | b0b00d49d25f09bd8d1de9e90f856f62f242201a (patch) | |
| tree | 8ed38be3d2dc559b05ad6a8df470f7aab37fda4a | |
| parent | cb018ec047cea6fd97d4d081b39bbcf6ceb3ac9e (diff) | |
| download | gtk+-b0b00d49d25f09bd8d1de9e90f856f62f242201a.tar.gz | |
testsuite: Test gtk4-builder-tool simplify --replace
Run all gtk4-builder-tool test with and without --replace.
This improves test coverage for gtk4-builder-tool
| -rwxr-xr-x | testsuite/tools/simplify-3to4.in | 16 | ||||
| -rwxr-xr-x | testsuite/tools/simplify.in | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/testsuite/tools/simplify-3to4.in b/testsuite/tools/simplify-3to4.in index 31d7da0970..35b8a8272f 100755 --- a/testsuite/tools/simplify-3to4.in +++ b/testsuite/tools/simplify-3to4.in @@ -7,13 +7,14 @@ TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp} shopt -s nullglob TESTS=( "$TEST_DATA_DIR"/*.ui ) -echo "1..${#TESTS[*]}" +echo "1..$((2 * ${#TESTS[*]}))" I=1 for t in ${TESTS[*]}; do name=$(basename $t .ui) expected="$TEST_DATA_DIR/$name.expected" result="$TEST_RESULT_DIR/$name.out" + result2="$TEST_RESULT_DIR/$name.out2" diff="$TEST_RESULT_DIR/$name.diff" ref="$TEST_RESULT_DIR/$name.ref" @@ -28,4 +29,17 @@ for t in ${TESTS[*]}; do fi I=$((I+1)) + + cp $t $result2 + $GTK_BUILDER_TOOL simplify --3to4 --replace $result2 2>/dev/null + + if diff -u "$expected" "$result2" > "$diff"; then + echo "ok $I $name (--replace)" + rm "$diff" + else + echo "not ok $I $name (--replace)" + cp "$expected" "$ref" + fi + + I=$((I+1)) done diff --git a/testsuite/tools/simplify.in b/testsuite/tools/simplify.in index c92c5c6d9c..e90437337b 100755 --- a/testsuite/tools/simplify.in +++ b/testsuite/tools/simplify.in @@ -7,13 +7,14 @@ TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp} shopt -s nullglob TESTS=( "$TEST_DATA_DIR"/*.ui ) -echo "1..${#TESTS[*]}" +echo "1..$((2 * ${#TESTS[*]}))" I=1 for t in ${TESTS[*]}; do name=$(basename $t .ui) expected="$TEST_DATA_DIR/$name.expected" result="$TEST_RESULT_DIR/$name.out" + result2="$TEST_RESULT_DIR/$name.out2" diff="$TEST_RESULT_DIR/$name.diff" ref="$TEST_RESULT_DIR/$name.ref" @@ -28,4 +29,17 @@ for t in ${TESTS[*]}; do fi I=$((I+1)) + + cp $t $result2 + $GTK_BUILDER_TOOL simplify --replace $result2 2>/dev/null + + if diff -u "$expected" "$result2" > "$diff"; then + echo "ok $I $name (--replace)" + rm "$diff" + else + echo "not ok $I $name (--replace)" + cp "$expected" "$ref" + fi + + I=$((I+1)) done |