From: David van Moolenbroek <david@minix3.org>
Date: Wed, 10 Oct 2012 18:10:14 +0000 (+0200)
Subject: tests: fix IPC test set fix
X-Git-Tag: v3.2.1~291
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/style.css?a=commitdiff_plain;h=52cf951fdcdec8ef18f923a9213fc4cb83c66202;p=minix.git

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 dda9fbe86..4264b5878 100644
--- 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 c475c4a61..836d16d31 100644
--- 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 f2324f187..11f1bc400 100644
--- 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 10086930d..93326e9e0 100644
--- 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 2f3f8e858..116acade0 100644
--- 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 1342607da..dbf7f136c 100644
--- 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);