Add a comment explaining why there are only 3 emulation warnings

and not 4 as one would expect.
Update the .exp file to show correct line numbers.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14962

diff --git a/none/tests/s390x/fpext_warn.c b/none/tests/s390x/fpext_warn.c
index 0bc4f6ddfe5292a075800302b9e14a40071e8e31..cc4bd764e062268af817b27a287422b0a6b850d8 100644 (file)
--- a/none/tests/s390x/fpext_warn.c
+++ b/none/tests/s390x/fpext_warn.c
@@ -11,6 +11,10 @@ main(void)
    __asm__ volatile ( CEGBRA(1,0,0,0) : : : "cc", "memory");
    __asm__ volatile ( CEFBRA(3,0,0,0) : : : "cc", "memory");
    __asm__ volatile ( CDGBRA(4,0,0,0) : : : "cc", "memory");
+
+   /* Note: an emulation warning is expected for the following
+      insn but none is given. The reason is that at most 3 warnings
+      of a given kind will be issued - and we already had three. */
    __asm__ volatile ( CEFBRA(5,0,0,0) : : : "cc", "memory");
 
    printf("after\n");

diff --git a/none/tests/s390x/fpext_warn.stderr.exp b/none/tests/s390x/fpext_warn.stderr.exp
index eb42c4929544fb085201494d4d4171281d5a8b94..0dd3bffb97680850ffeb81e693282cc8e810037c 100644 (file)
--- a/none/tests/s390x/fpext_warn.stderr.exp
+++ b/none/tests/s390x/fpext_warn.stderr.exp
@@ -4,17 +4,17 @@ Emulation warning: unsupported action:
   feature requires the floating point extension facility
   which is not available on this host. Continuing using
   the rounding mode from FPC. Results may differ!
-   at 0x........: main (fpext_warn.c:10)
+   at 0x........: main (fpext_warn.c:11)
 Emulation warning: unsupported action:
   The specified rounding mode cannot be supported. That
   feature requires the floating point extension facility
   which is not available on this host. Continuing using
   the rounding mode from FPC. Results may differ!
-   at 0x........: main (fpext_warn.c:10)
+   at 0x........: main (fpext_warn.c:12)
 Emulation warning: unsupported action:
   The specified rounding mode cannot be supported. That
   feature requires the floating point extension facility
   which is not available on this host. Continuing using
   the rounding mode from FPC. Results may differ!
-   at 0x........: main (fpext_warn.c:10)
+   at 0x........: main (fpext_warn.c:13)