diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/end-to-end/actions/action-equality.sh | 4 | ||||
| -rwxr-xr-x | test/end-to-end/actions/nested-trees.sh | 4 | ||||
| -rwxr-xr-x | test/end-to-end/generated-binary/compiled.sh | 4 | ||||
| -rwxr-xr-x | test/end-to-end/generated-binary/shell-script.sh | 2 | ||||
| -rwxr-xr-x | test/end-to-end/targets/repo_names.sh | 4 | ||||
| -rwxr-xr-x | test/end-to-end/targets/upwards.sh | 10 | ||||
| -rwxr-xr-x | test/end-to-end/user-errors/flat-stage.sh | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/test/end-to-end/actions/action-equality.sh b/test/end-to-end/actions/action-equality.sh index ffe841f4..083dbb6d 100755 --- a/test/end-to-end/actions/action-equality.sh +++ b/test/end-to-end/actions/action-equality.sh @@ -46,14 +46,14 @@ cat > TARGETS <<'EOI' EOI -bin/tool-under-test build -J 1 --local_build_root .tool-root -f build.log --log-limit 2 2>&1 +bin/tool-under-test build -J 1 --local-build-root .tool-root -f build.log --log-limit 2 2>&1 cat build.log echo grep 'Processed.* 4 actions' build.log grep '1 cache hit' build.log echo -bin/tool-under-test analyse --dump_graph graph.json 2>&1 +bin/tool-under-test analyse --dump-graph graph.json 2>&1 echo matching_targets=$(cat graph.json | jq -acM '.actions | [ .[] | .origins | [ .[] | .target]] | sort') echo "${matching_targets}" diff --git a/test/end-to-end/actions/nested-trees.sh b/test/end-to-end/actions/nested-trees.sh index 70d69ee5..de5ce567 100755 --- a/test/end-to-end/actions/nested-trees.sh +++ b/test/end-to-end/actions/nested-trees.sh @@ -90,7 +90,7 @@ echo echo Analysis echo ../bin/tool-under-test analyse data \ - --dump_trees ../trees.json --dump_blobs ../blobs.json 2>&1 + --dump-trees ../trees.json --dump-blobs ../blobs.json 2>&1 echo echo Blobs echo @@ -104,7 +104,7 @@ cat ../trees.json echo echo Build echo -../bin/tool-under-test install -o ../out --local_build_root ../tool-root 2>&1 +../bin/tool-under-test install -o ../out --local-build-root ../tool-root 2>&1 echo echo Index echo diff --git a/test/end-to-end/generated-binary/compiled.sh b/test/end-to-end/generated-binary/compiled.sh index 572e8187..9372a54c 100755 --- a/test/end-to-end/generated-binary/compiled.sh +++ b/test/end-to-end/generated-binary/compiled.sh @@ -16,8 +16,8 @@ EOI echo echo "Analysing" -bin/tool-under-test analyse --dump_graph graph.json 2>&1 +bin/tool-under-test analyse --dump-graph graph.json 2>&1 echo echo "Building" -bin/tool-under-test install -o out --local_build_root .tool-root -J 16 2>&1 +bin/tool-under-test install -o out --local-build-root .tool-root -J 16 2>&1 diff --git a/test/end-to-end/generated-binary/shell-script.sh b/test/end-to-end/generated-binary/shell-script.sh index 62dd11fd..33545588 100755 --- a/test/end-to-end/generated-binary/shell-script.sh +++ b/test/end-to-end/generated-binary/shell-script.sh @@ -44,6 +44,6 @@ cat > TARGETS <<'EOI' EOI -bin/tool-under-test install -o out --local_build_root .tool-root 2>&1 +bin/tool-under-test install -o out --local-build-root .tool-root 2>&1 grep Hello out/out.txt grep Good out/out.txt diff --git a/test/end-to-end/targets/repo_names.sh b/test/end-to-end/targets/repo_names.sh index 2e9ba579..adf03054 100755 --- a/test/end-to-end/targets/repo_names.sh +++ b/test/end-to-end/targets/repo_names.sh @@ -74,7 +74,7 @@ EOF mkdir -p .root echo == Building in A == -./bin/tool-under-test install -C bindings.json -o . --local_build_root .root --main A . back 2>&1 +./bin/tool-under-test install -C bindings.json -o . --local-build-root .root --main A . back 2>&1 cat back.txt grep -q 'I am A' back.txt grep -q 'This is B' back.txt @@ -82,7 +82,7 @@ grep -q 'Hello A' back.txt rm -f back.txt echo == Building in B == -./bin/tool-under-test install -C bindings.json -o . --local_build_root .root --main B . back 2>&1 +./bin/tool-under-test install -C bindings.json -o . --local-build-root .root --main B . back 2>&1 cat back.txt grep -q 'I am B' back.txt grep -q 'This is A' back.txt diff --git a/test/end-to-end/targets/upwards.sh b/test/end-to-end/targets/upwards.sh index 5d6b7e39..0e281cfe 100755 --- a/test/end-to-end/targets/upwards.sh +++ b/test/end-to-end/targets/upwards.sh @@ -23,8 +23,8 @@ cat > src/TARGETS <<'EOF' } EOF -./bin/tool-under-test install -o out --workspace_root src \ - --local_build_root .root . it 2>&1 +./bin/tool-under-test install -o out --workspace-root src \ + --local-build-root .root . it 2>&1 grep OK out/out grep BAD out/out && exit 1 || : @@ -46,8 +46,8 @@ cat > src/deep/TARGETS <<'EOF' EOF -./bin/tool-under-test install -o out2 --workspace_root src \ - --local_build_root .root deep 'OK up' 2>&1 +./bin/tool-under-test install -o out2 --workspace-root src \ + --local-build-root .root deep 'OK up' 2>&1 grep OK out2/out # Upwards refernces and targets outside the repo are not OK @@ -73,7 +73,7 @@ EOF cat src/TARGETS -./bin/tool-under-test analyse --workspace_root src . it 2>&1 && exit 1 || : +./bin/tool-under-test analyse --workspace-root src . it 2>&1 && exit 1 || : done diff --git a/test/end-to-end/user-errors/flat-stage.sh b/test/end-to-end/user-errors/flat-stage.sh index e0ee2780..8d29716a 100755 --- a/test/end-to-end/user-errors/flat-stage.sh +++ b/test/end-to-end/user-errors/flat-stage.sh @@ -51,12 +51,12 @@ cat > TARGETS <<'EOI' EOI -bin/tool-under-test build --local_build_root .tool-root -f build.log full 2>&1 +bin/tool-under-test build --local-build-root .tool-root -f build.log full 2>&1 echo grep 'DataRuleSpecificErrorMessage' build.log && exit 1 || : grep 'DeBuG-InFoRmAtIoN' build.log && exit 1 || : -bin/tool-under-test build --local_build_root .tool-root -f build.log flat 2>&1 && exit 1 || : +bin/tool-under-test build --local-build-root .tool-root -f build.log flat 2>&1 && exit 1 || : echo grep 'DataRuleSpecificErrorMessage' build.log grep "DeBuG-InFoRmAtIoN" build.log |