diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-21 11:27:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-21 11:27:33 +0000 |
| commit | 7b5425318a27d0a41c1008a36c502719255b8f5e (patch) | |
| tree | 27b039c4cc7f3eb12167f8db6823c830665b877c /tests | |
| parent | bf12043acc6458e7b71d19a9f030b31ec22fba12 (diff) | |
| parent | 22c30b2d20e828edadbd992c1d4c4bfd0f3433ba (diff) | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-rc3-testing-and-tcg-201119-1' into staging
A few test and doc fixes:
- tweak DEBUG behaviour for vm-test-build
- rename and update plug docs for versioning
- slim down MAIN_SOFTMMU_TARGETS
# gpg: Signature made Wed 20 Nov 2019 10:56:23 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-rc3-testing-and-tcg-201119-1:
tests/tcg: modify multiarch tests to work with clang
.travis.yml: drop 32 bit systems from MAIN_SOFTMMU_TARGETS
docs/devel: update tcg-plugins.rst with API versioning details
docs/devel: rename plugins.rst to tcg-plugins.rst
tests/vm: make --interactive (and therefore DEBUG=1) unconditional
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tcg/multiarch/float_helpers.c | 2 | ||||
| -rw-r--r-- | tests/tcg/multiarch/linux-test.c | 6 | ||||
| -rwxr-xr-x | tests/vm/basevm.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tests/tcg/multiarch/float_helpers.c b/tests/tcg/multiarch/float_helpers.c index 8ee7903c78..bc530e5732 100644 --- a/tests/tcg/multiarch/float_helpers.c +++ b/tests/tcg/multiarch/float_helpers.c @@ -79,11 +79,9 @@ char *fmt_16(uint16_t num) #ifndef SNANF /* Signaling NaN macros, if supported. */ -# if __GNUC_PREREQ(3, 3) # define SNANF (__builtin_nansf ("")) # define SNAN (__builtin_nans ("")) # define SNANL (__builtin_nansl ("")) -# endif #endif static float f32_numbers[] = { diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index 673d7c8a1c..8a7c15cd31 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -485,7 +485,11 @@ static void test_signal(void) act.sa_flags = SA_SIGINFO; chk_error(sigaction(SIGSEGV, &act, NULL)); if (setjmp(jmp_env) == 0) { - *(uint8_t *)0 = 0; + /* + * clang requires volatile or it will turn this into a + * call to abort() instead of forcing a SIGSEGV. + */ + *(volatile uint8_t *)0 = 0; } act.sa_handler = SIG_DFL; diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 91a9226026..0b8c1b2657 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -403,7 +403,7 @@ def main(vmcls): exitcode = 0 if vm.ssh(*cmd) != 0: exitcode = 3 - if exitcode != 0 and args.interactive: + if args.interactive: vm.ssh() if not args.snapshot: |