diff options
Diffstat (limited to 'test/148-multithread-gc-annotations')
| -rw-r--r--[-rwxr-xr-x] | test/148-multithread-gc-annotations/run.py (renamed from test/148-multithread-gc-annotations/check) | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/test/148-multithread-gc-annotations/check b/test/148-multithread-gc-annotations/run.py index 67fcafbe6e..9216c06e4c 100755..100644 --- a/test/148-multithread-gc-annotations/check +++ b/test/148-multithread-gc-annotations/run.py @@ -1,12 +1,12 @@ #!/bin/bash # -# Copyright (C) 2015 The Android Open Source Project +# Copyright 2022 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,12 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Inputs: -# $1: Test's expected standard output -# $2: Test's actual standard output -# $3: Test's expected standard error -# $4: Test's actual standard error -# Check that the string "error" isn't present -grep -vq error "$2" \ - && diff --strip-trailing-cr -q "$3" "$4" >/dev/null +def run(ctx, args): + ctx.default_run(args) + + # Check that the string "error" isn't present (delete all non-error lines) + ctx.run(fr"sed -i '/error/!d' '{args.stdout_file}'") |