]> granicus.if.org Git - strace/commitdiff
tests/shmxt.c: robustify against arch specific issues
authorDmitry V. Levin <ldv@altlinux.org>
Sat, 23 Apr 2016 01:53:43 +0000 (01:53 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 25 Apr 2016 01:54:05 +0000 (01:54 +0000)
Do not treat failed shmat(SHM_RND) as a test failure.
This change partially reverts commit
bea707377d2ee3e1950bfa43537ef928163a5fa6.

* tests/shmxt.c (main): Use SHM_RND in the second shmat call,
do not treat its potential error as a test failure.

tests/shmxt.c

index fdfa6d7f1de1c5139944bdbde7d89f6b196c7dd5..8e087f3c636a3420345d48c58a92f9ce2d510425 100644 (file)
@@ -39,11 +39,14 @@ main(void)
                perror_msg_and_skip("shmdt");
        printf("shmdt(%p) = 0\n", shmaddr);
 
-       void *shmaddr2 = shmat(id, shmaddr, 0);
+       ++shmaddr;
+       void *shmaddr2 = shmat(id, shmaddr, SHM_RND);
        if (shmaddr2 == (void *)(-1))
-               perror_msg_and_skip("shmat %p", shmaddr);
-       printf("%s(%d, %p, 0) = %p\n",
-              SHMAT, id, shmaddr, shmaddr2);
+               printf("%s(%d, %p, SHM_RND) = -1 %s (%m)\n",
+                      SHMAT, id, shmaddr, errno2name());
+       else
+               printf("%s(%d, %p, SHM_RND) = %p\n",
+                      SHMAT, id, shmaddr, shmaddr2);
 
        puts("+++ exited with 0 +++");
        return 0;