A couple of these syscalls fail differently when running on an amd64

in 32-bit mode.

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

diff --git a/memcheck/tests/x86/scalar.c b/memcheck/tests/x86/scalar.c
index d915a274d0e21d19036c434d35d6f5696d5083ee..a0b8c4ab301b2745280193ee996e46ece0585083 100644 (file)
--- a/memcheck/tests/x86/scalar.c
+++ b/memcheck/tests/x86/scalar.c
@@ -268,8 +268,10 @@ int main(void)
    SY(__NR_fcntl, x0-1, x0+F_DUPFD, x0); FAILx(EBADF);
 
    // For F_GETLK the 3rd arg is 'lock'
+   // on x86, this fails with EBADF.  But on amd64 in 32-bit mode
+   // it fails with EFAULT.
    GO(__NR_fcntl, "(GETLK) 1s 0m");
-   SY(__NR_fcntl, x0-1, x0+F_GETLK, x0); FAILx(EBADF);
+   SY(__NR_fcntl, x0-1, x0+F_GETLK, x0); FAIL; //FAILx(EBADF);
 
    // __NR_mpx 56
    GO(__NR_mpx, "ni");
@@ -975,8 +977,10 @@ int main(void)
    SY(__NR_fcntl64, x0-1, x0+F_DUPFD, x0); FAILx(EBADF);
 
    // For F_GETLK the 3rd arg is 'lock'
+   // on x86, this fails with EBADF.  But on amd64 in 32-bit mode
+   // it fails with EFAULT.
    GO(__NR_fcntl64, "(GETLK) 1s 0m");
-   SY(__NR_fcntl64, x0-1, x0+F_GETLK, x0); FAILx(EBADF);
+   SY(__NR_fcntl64, x0-1, x0+F_GETLK, x0); FAIL; //FAILx(EBADF);
 
    // 222
    GO(222, "ni");