Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: fix IPC test set

Browse Source 
- use one single library instead of loose library files
- we don't have ftime() anymore
- shmat(non-NULL) is currently broken, fix shmt test set to bypass this
- some other small issues
This commit is contained in:
David van Moolenbroek
2012-09-10 19:20:03 +02:00
parent c9f644bd68
commit df3975243b
21 changed files with 56 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/ipc/shmt/Makefile
+3 -6
View File
@@ -1,18 +1,15 @@
# Makefile for the tests
CC = exec cc
CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -I../lib/
CFLAGS = -Wall -D_MINIX -D_POSIX_SOURCE -D_NETBSD_SOURCE=1 -I../lib/
PROG = shmt02 shmt03 shmt04 shmt05 shmt06 \
shmt07 shmt08 shmt10 shmt01
all: $(PROG)
$(PROG): tst_res.o
$(CC) $(CFLAGS) -o $@ $@.c tst_res.o
tst_res.o: ../lib/tst_res.c
$(CC) $(CFLAGS) -c -o tst_res.o ../lib/tst_res.c
$(PROG): ../libipc.a
$(CC) $(CFLAGS) -o $@ $@.c ../libipc.a
test:
sh testshm.sh
test/ipc/shmt/shmt01.c
+1 -1
View File
@@ -59,7 +59,7 @@ int main(void)
/* are we doing with ia64 or arm_arch_4t arch */
#if defined (__ia64__) || defined (__ARM_ARCH_4T__)
#if defined (__ia64__) || defined (__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, (void *)NULL, 0);
#else
cp = (char *) shmat(shmid, (void *)0x80000, 0);
test/ipc/shmt/shmt02.c
+1 -1
View File
@@ -81,7 +81,7 @@ int main(void)
/* are we doing with ia64 or arm_arch_4t arch */
#if defined (__ia64__) || defined (__ARM_ARCH_4T__)
#if defined (__ia64__) || defined (__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, (void *)NULL, 0);
#else
cp = (char *) shmat(shmid, (void *)0x80000, 0);
test/ipc/shmt/shmt04.c
+8 -8
View File
@@ -61,7 +61,7 @@ extern int Tst_count; /* Test Case counter for tst_* routines */
key_t key;
sigset_t sigset;
sigset_t mysigset;
#define ADDR1 (void *)0x40000000
#define ADDR (void *)0x80000
@@ -81,9 +81,9 @@ int main(void)
signal(SIGUSR1, SIG_DFL);
sigemptyset(&sigset);
sigaddset(&sigset,SIGUSR1);
sigprocmask(SIG_BLOCK,&sigset,NULL);
sigemptyset(&mysigset);
sigaddset(&mysigset,SIGUSR1);
sigprocmask(SIG_BLOCK,&mysigset,NULL);
pid = fork();
switch (pid) {
@@ -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__)
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);
@@ -171,8 +171,8 @@ int shmid,
chld_pid ;
char *cp;
sigemptyset(&sigset);
sigsuspend(&sigset);
sigemptyset(&mysigset);
sigsuspend(&mysigset);
chld_pid = getpid() ;
/*--------------------------------------------------------*/
@@ -187,7 +187,7 @@ else
{
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR1, 0);
#elif defined(__ARM_ARCH_4T__)
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);
test/ipc/shmt/shmt05.c
+1 -1
View File
@@ -88,7 +88,7 @@ int main(void)
} else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR_IA, 0);
#elif defined(__ARM_ARCH_4T__)
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, (void *)NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);
test/ipc/shmt/shmt06.c
+8 -8
View File
@@ -66,7 +66,7 @@ extern int Tst_count; /* Test Case counter for tst_* routines */
/**************/
key_t key;
sigset_t sigset;
sigset_t mysigset;
int child(void);
int rm_shm(int);
@@ -81,9 +81,9 @@ int main(void)
signal(SIGUSR1, SIG_DFL);
sigemptyset(&sigset);
sigaddset(&sigset,SIGUSR1);
sigprocmask(SIG_BLOCK,&sigset,NULL);
sigemptyset(&mysigset);
sigaddset(&mysigset,SIGUSR1);
sigprocmask(SIG_BLOCK,&mysigset,NULL);
pid = fork();
switch (pid) {
@@ -109,7 +109,7 @@ int main(void)
else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR_IA, 0);
#elif defined(__ARM_ARCH_4T__)
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, (void*) NULL, 0);
#elif defined(__mips__)
cp = (char *) shmat(shmid, ADDR_MIPS, 0);
@@ -172,8 +172,8 @@ int child(void)
chld_pid ;
char *cp;
sigemptyset(&sigset);
sigsuspend(&sigset);
sigemptyset(&mysigset);
sigsuspend(&mysigset);
chld_pid = getpid() ;
if ((shmid = shmget(key, SIZE, 0)) < 0) {
@@ -185,7 +185,7 @@ int child(void)
else {
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR1_IA, 0);
#elif defined(__ARM_ARCH_4T__)
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, (void *) NULL, 0);
#elif defined(__mips__)
cp = (char *) shmat(shmid, ADDR1_MIPS, 0);
test/ipc/shmt/shmt07.c
+1 -1
View File
@@ -84,7 +84,7 @@ int main(void)
#ifdef __ia64__
cp = (char *) shmat(shmid, ADDR_IA, 0);
#elif defined(__ARM_ARCH_4T__)
#elif defined(__ARM_ARCH_4T__) || defined(__minix)
cp = (char *) shmat(shmid, (void *) NULL, 0);
#else
cp = (char *) shmat(shmid, ADDR, 0);