summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Srbecky <dsrbecky@google.com> 2022-10-31 19:13:02 +0000
committer David Srbecky <dsrbecky@google.com> 2022-10-31 22:23:47 +0000
commite51dcb9bee332bc61234a61aa2af314746dcceda (patch)
tree72ad0a59de018a7065fa095ad86345f5fda35523
parentdb12173f6761ccdb23288485856f2716525b7f5a (diff)
Remove "exit status" from run-test stdout.
This is left over from bash. The python script already specifies the expected_exit_code, so the stdout line is redundant and confusing (since the process never actually printed such message to stdout). The python runner will still abort if the test's exit code does not match the declared expected value. Test: test.py -r --all-target --optimizing --64 Change-Id: I69555bf959337fde362108f4df0524d66daddd14
-rw-r--r--test/030-bad-finalizer/expected-stdout.txt1
-rw-r--r--test/034-call-null/expected-stdout.txt1
-rw-r--r--test/038-inner-null/expected-stdout.txt1
-rw-r--r--test/054-uncaught/expected-stdout.txt1
-rw-r--r--test/1336-short-finalizer-timeout/expected-stdout.txt1
-rw-r--r--test/2041-bad-cleaner/expected-stdout.txt1
-rw-r--r--test/714-invoke-custom-lambda-metafactory/expected-stdout.txt1
-rwxr-xr-xtest/etc/default_run.py2
8 files changed, 0 insertions, 9 deletions
diff --git a/test/030-bad-finalizer/expected-stdout.txt b/test/030-bad-finalizer/expected-stdout.txt
index a0ae9abf39..63e2895cbf 100644
--- a/test/030-bad-finalizer/expected-stdout.txt
+++ b/test/030-bad-finalizer/expected-stdout.txt
@@ -2,4 +2,3 @@ About to null reference.
Finalizer started and sleeping briefly...
Finalizer done snoozing.
Finalizer sleeping forever now.
-exit status: 2
diff --git a/test/034-call-null/expected-stdout.txt b/test/034-call-null/expected-stdout.txt
index a9bf5a0e14..e69de29bb2 100644
--- a/test/034-call-null/expected-stdout.txt
+++ b/test/034-call-null/expected-stdout.txt
@@ -1 +0,0 @@
-exit status: 1
diff --git a/test/038-inner-null/expected-stdout.txt b/test/038-inner-null/expected-stdout.txt
index 3d87b3ff95..24836c2ec1 100644
--- a/test/038-inner-null/expected-stdout.txt
+++ b/test/038-inner-null/expected-stdout.txt
@@ -1,2 +1 @@
new Special()
-exit status: 1
diff --git a/test/054-uncaught/expected-stdout.txt b/test/054-uncaught/expected-stdout.txt
index 878260a07d..7d7f03c3a7 100644
--- a/test/054-uncaught/expected-stdout.txt
+++ b/test/054-uncaught/expected-stdout.txt
@@ -18,4 +18,3 @@ Uncaught exception DEFAULT!
java.lang.NullPointerException: Hi diddly-ho, neighborino.
at Main.catchTheUncaught(Main.java:63)
at Main.main(Main.java:26)
-exit status: 1
diff --git a/test/1336-short-finalizer-timeout/expected-stdout.txt b/test/1336-short-finalizer-timeout/expected-stdout.txt
index 496e0e683f..802b89ed5a 100644
--- a/test/1336-short-finalizer-timeout/expected-stdout.txt
+++ b/test/1336-short-finalizer-timeout/expected-stdout.txt
@@ -3,4 +3,3 @@ About to null reference.
Finalizer started and snoozing...
Finalizer done snoozing.
Finalizer sleeping forever now.
-exit status: 2
diff --git a/test/2041-bad-cleaner/expected-stdout.txt b/test/2041-bad-cleaner/expected-stdout.txt
index 848a3525b6..db360978d6 100644
--- a/test/2041-bad-cleaner/expected-stdout.txt
+++ b/test/2041-bad-cleaner/expected-stdout.txt
@@ -2,4 +2,3 @@ About to null reference.
Cleaner started and sleeping briefly...
Cleaner done snoozing.
Cleaner sleeping forever now.
-exit status: 2
diff --git a/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt b/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt
index a9bf5a0e14..e69de29bb2 100644
--- a/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt
+++ b/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt
@@ -1 +0,0 @@
-exit status: 1
diff --git a/test/etc/default_run.py b/test/etc/default_run.py
index 65e340bae0..268ec2fc2a 100755
--- a/test/etc/default_run.py
+++ b/test/etc/default_run.py
@@ -197,8 +197,6 @@ def default_run(ctx, args, **kwargs):
if stdout_file:
with open(stdout_file, "a") as f:
f.write(proc.stdout)
- if proc.returncode != 0:
- f.write("exit status: {}\n".format(proc.returncode))
if stderr_file:
with open(stderr_file, "a") as f:
f.write(proc.stderr)