diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-30 19:43:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-30 19:43:03 +0100 |
| commit | 162945d2a91899b637bbb9e163b406350de12906 (patch) | |
| tree | 49cc2cc66f724a7c6f033f93aaba4ae3be1f2259 /dev-lang/starlark-rust/files | |
| parent | f660c6de84558324d784218831d8f0782ee41e2e (diff) | |
gentoo resync : 30.10.2021
Diffstat (limited to 'dev-lang/starlark-rust/files')
| -rw-r--r-- | dev-lang/starlark-rust/files/test/features.bash | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/dev-lang/starlark-rust/files/test/features.bash b/dev-lang/starlark-rust/files/test/features.bash index 1fd74e3326e9..78e08bf7b858 100644 --- a/dev-lang/starlark-rust/files/test/features.bash +++ b/dev-lang/starlark-rust/files/test/features.bash @@ -92,11 +92,9 @@ _test-features_execute-test() { local error_msg test_title=$1 test_stdin=$2 exp_stdout=$3 exp_stderr=$4 exp_exitcode=$5 ebegin "$test_title" error_msg=$( - stderr_file=$(mktemp) || exit - cleanup() { rm -f "$stderr_file"; } - trap cleanup EXIT - - test_stdout=$("$starlark_binary" -i --json <<< "$test_stdin" 2>"$stderr_file") + # Redirect stderr to stdin because print goes to stderr since this commit: + # https://github.com/facebookexperimental/starlark-rust/commit/cdd68fa752aa8b6cae602297de1e43658b0a63fd + test_stdout=$("$starlark_binary" -i --json <<< "$test_stdin" 2>&1) test_exitcode=$? if (( test_exitcode != exp_exitcode )); then @@ -105,9 +103,6 @@ _test-features_execute-test() { elif [[ "$test_stdout" != "$exp_stdout" ]]; then echo "unexpected stdout \"$test_stdout\", expected stdout \"$exp_stdout\" for test_stdin: $test_stdin" exit 1 - elif [[ $(< "$stderr_file") != "$exp_stderr" ]]; then - echo "unexpected stderr \"$(< "$stderr_file")\", expected stderr \"$exp_stderr\" for test_stdin: $test_stdin" - exit 1 fi exit 0 ) |