tests: fix IPC test set fix

Partial rollback of git-df39752.

diff --git a/test/ipc/shmt/shmt01.c b/test/ipc/shmt/shmt01.c
index dda9fbe86bdd3ac552ac80aeeef1300078a3fef1..4264b58780080c79a400cda39e7cb6980615548f 100644 (file)
--- a/test/ipc/shmt/shmt01.c
+++ b/test/ipc/shmt/shmt01.c
@@ -59,7 +59,7 @@ int main(void)
 
 
                 /* are we doing with ia64 or arm_arch_4t arch */
-#if defined (__ia64__) || defined (__ARM_ARCH_4T__) || defined(__minix)
+#if defined (__ia64__) || defined (__ARM_ARCH_4T__)
                 cp = (char *) shmat(shmid, (void *)NULL, 0);
 #else          
                 cp = (char *) shmat(shmid, (void *)0x80000, 0);

diff --git a/test/ipc/shmt/shmt02.c b/test/ipc/shmt/shmt02.c
index c475c4a6135d258cea28b6f230ea02dcf608408b..836d16d312e9c5e297e060094c6b075378fb8dba 100644 (file)
--- a/test/ipc/shmt/shmt02.c
+++ b/test/ipc/shmt/shmt02.c
@@ -81,7 +81,7 @@ int main(void)
 
 
                 /* are we doing with ia64 or arm_arch_4t arch */
-#if defined (__ia64__) || defined (__ARM_ARCH_4T__) || defined(__minix)
+#if defined (__ia64__) || defined (__ARM_ARCH_4T__)
                 cp = (char *) shmat(shmid, (void *)NULL, 0);
 #else          
                 cp = (char *) shmat(shmid, (void *)0x80000, 0);

diff --git a/test/ipc/shmt/shmt04.c b/test/ipc/shmt/shmt04.c
index f2324f1875eae379ebba98e0300b17d7bb9053ff..11f1bc400e816026f25e1be2504093438356cb93 100644 (file)
--- a/test/ipc/shmt/shmt04.c
+++ b/test/ipc/shmt/shmt04.c
@@ -109,7 +109,7 @@ if ((shmid = shmget(key, SIZE, IPC_CREAT|0666)) < 0 ) {
 else {
 #ifdef __ia64__
   cp = (char *) shmat(shmid, ADDR1, 0);
-#elif defined(__ARM_ARCH_4T__) || defined(__minix)
+#elif defined(__ARM_ARCH_4T__)
   cp = (char *) shmat(shmid, NULL, 0);
 #else
   cp = (char *) shmat(shmid, ADDR, 0);
@@ -187,7 +187,7 @@ else
 {
 #ifdef __ia64__
   cp = (char *) shmat(shmid, ADDR1, 0);
-#elif defined(__ARM_ARCH_4T__) || defined(__minix)
+#elif defined(__ARM_ARCH_4T__)
   cp = (char *) shmat(shmid, NULL, 0);
 #else
   cp = (char *) shmat(shmid, ADDR, 0);

diff --git a/test/ipc/shmt/shmt05.c b/test/ipc/shmt/shmt05.c
index 10086930d9a2816ad20f7aa1d50582d0984eda90..93326e9e08a607856b6454f78df936575b3fd4cb 100644 (file)
--- a/test/ipc/shmt/shmt05.c
+++ b/test/ipc/shmt/shmt05.c
@@ -88,7 +88,7 @@ int main(void)
  } else {
 #ifdef __ia64__ 
   cp = (char *) shmat(shmid, ADDR_IA, 0);
-#elif defined(__ARM_ARCH_4T__) || defined(__minix)
+#elif defined(__ARM_ARCH_4T__)
   cp = (char *) shmat(shmid, (void *)NULL, 0);
 #else
   cp = (char *) shmat(shmid, ADDR, 0);

diff --git a/test/ipc/shmt/shmt06.c b/test/ipc/shmt/shmt06.c
index 2f3f8e8582990d1762864c17cd8c51311cd1c436..116acade0770ca9094e0a6583cd451e0b570b9c7 100644 (file)
--- a/test/ipc/shmt/shmt06.c
+++ b/test/ipc/shmt/shmt06.c
@@ -109,7 +109,7 @@ int main(void)
        else {
 #ifdef __ia64__
                  cp = (char *) shmat(shmid, ADDR_IA, 0);
-#elif defined(__ARM_ARCH_4T__) || defined(__minix)
+#elif defined(__ARM_ARCH_4T__)
                  cp = (char *) shmat(shmid, (void*) NULL, 0);
 #elif defined(__mips__)
                  cp = (char *) shmat(shmid, ADDR_MIPS, 0);
@@ -185,7 +185,7 @@ int child(void)
        else {
 #ifdef __ia64__        
                  cp = (char *) shmat(shmid, ADDR1_IA, 0);
-#elif defined(__ARM_ARCH_4T__) || defined(__minix)
+#elif defined(__ARM_ARCH_4T__)
                  cp = (char *) shmat(shmid, (void *) NULL, 0);
 #elif defined(__mips__)        
                  cp = (char *) shmat(shmid, ADDR1_MIPS, 0);

diff --git a/test/ipc/shmt/shmt07.c b/test/ipc/shmt/shmt07.c
index 1342607da233151fed34f9888dfba98c07a2116f..dbf7f136c2fbe9a790d24a50fcaf249d4731b615 100644 (file)
--- a/test/ipc/shmt/shmt07.c
+++ b/test/ipc/shmt/shmt07.c
@@ -84,7 +84,7 @@ int main(void)
 
 #ifdef __ia64__        
          cp = (char *) shmat(shmid, ADDR_IA, 0);
-#elif defined(__ARM_ARCH_4T__) || defined(__minix)
+#elif defined(__ARM_ARCH_4T__)
          cp = (char *) shmat(shmid, (void *) NULL, 0);
 #else
          cp = (char *) shmat(shmid, ADDR, 0);