summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Habkost2017-06-14 16:49:39 +0200
committerEduardo Habkost2017-07-17 20:41:29 +0200
commit2a6f395b9a849942804fae626dad505d17f247da (patch)
treea11e68100f523910ca030cc9cf088b00724c49f4
parentMerge remote-tracking branch 'remotes/kraxel/tags/usb-20170717-pull-request' ... (diff)
downloadqemu-2a6f395b9a849942804fae626dad505d17f247da.tar.gz
qemu-2a6f395b9a849942804fae626dad505d17f247da.tar.xz
qemu-2a6f395b9a849942804fae626dad505d17f247da.zip
device-crash-test: Fix regexp on whitelist
The "||" in the whitelist entry was not escaped, making the regexp match all strings, on every single cases where QEMU aborted. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20170614144939.1115-1-ehabkost@redhat.com>
-rwxr-xr-xscripts/device-crash-test2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 5f90e9bb54..e77b693eb2 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -219,7 +219,7 @@ ERROR_WHITELIST = [
{'exitcode':-6, 'log':r"Object .* is not an instance of type spapr-machine", 'loglevel':logging.ERROR},
{'exitcode':-6, 'log':r"Object .* is not an instance of type generic-pc-machine", 'loglevel':logging.ERROR},
{'exitcode':-6, 'log':r"Object .* is not an instance of type e500-ccsr", 'loglevel':logging.ERROR},
- {'exitcode':-6, 'log':r"vmstate_register_with_alias_id: Assertion `!se->compat || se->instance_id == 0' failed", 'loglevel':logging.ERROR},
+ {'exitcode':-6, 'log':r"vmstate_register_with_alias_id: Assertion `!se->compat \|\| se->instance_id == 0' failed", 'loglevel':logging.ERROR},
{'exitcode':-11, 'device':'stm32f205-soc', 'loglevel':logging.ERROR, 'expected':True},
{'exitcode':-11, 'device':'xlnx,zynqmp', 'loglevel':logging.ERROR, 'expected':True},
{'exitcode':-11, 'device':'mips-cps', 'loglevel':logging.ERROR, 'expected':True},