tests: fix DS tests

diff --git a/test/ds/Makefile b/test/ds/Makefile
index 63bf396acb8f306bd427c88ca11c8deda30442a8..2ecd7e3c0777da9c8290f312dc31d3e024cd0773 100644 (file)
--- a/test/ds/Makefile
+++ b/test/ds/Makefile
@@ -1,18 +1,14 @@
-all: dstest subs
-       chmod +x down run
+# Makefile for DS tests
+PROG=  dstest subs
+SRCS.dstest=   dstest.c
+SRCS.subs=     subs.c
 
-dstest: dstest.c inc.h
-       cc -o $@ $< -lsys
+DPADD+=        ${LIBSYS}
+LDADD+=        -lsys
 
-subs: subs.c inc.h
-       cc -o $@ $< -lsys
+MAN=
 
-run: all
-       sh run
-
-kill:
-       sh down
-
-clean:
-       rm -f dstest subs
+BINDIR?= /usr/sbin
 
+.include "Makefile.inc"
+.include <minix.service.mk>

diff --git a/test/ds/Makefile.inc b/test/ds/Makefile.inc
new file mode 100644 (file)
index 0000000..f166ffe
--- /dev/null
+++ b/test/ds/Makefile.inc
@@ -0,0 +1,5 @@
+# Copied from drivers/Makefile.inc
+CPPFLAGS+= -D_MINIX -D_NETBSD_SOURCE
+LDADD+= -lminlib -lcompat_minix
+DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+BINDIR?=/usr/sbin

diff --git a/test/ds/down b/test/ds/down
deleted file mode 100644 (file)
index ad9cd5b..0000000
--- a/test/ds/down
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-service down dstest
-service down subs

diff --git a/test/ds/dstest.c b/test/ds/dstest.c
index 044123468202c1036ae420fedb17178a426f92b5..f903b34a12ac55ddb14612baa5b36cf189037b98 100644 (file)
--- a/test/ds/dstest.c
+++ b/test/ds/dstest.c
@@ -12,7 +12,7 @@ char *key_label = "test_label";
 void test_u32(void)
 {
        int r;
-       unsigned long value;
+       u32_t value;
 
        /* Publish and retrieve. */
        r = ds_publish_u32(key_u32, 1234, 0);
@@ -201,17 +201,11 @@ void test_map(void)
        printf("DSTEST: MAP test successful!\n");
 }
 
-/* SEF functions and variables. */
-static void sef_local_startup(void);
-
 /*===========================================================================*
- *                             main                                         *
+ *                            sef_cb_init_fresh                             *
  *===========================================================================*/
-int main(void)
+static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
 {
-       /* SEF local startup. */
-       sef_local_startup();
-
        /* Run all the tests. */
        test_u32();
        test_str();
@@ -219,16 +213,27 @@ int main(void)
        test_map();
        test_label();
 
-       return 0;
+       return OK;
 }
 
-
 /*===========================================================================*
  *                            sef_local_startup                             *
  *===========================================================================*/
-static void sef_local_startup()
+static void sef_local_startup(void)
 {
-  /* Let SEF perform startup. */
-  sef_startup();
+       /* Let SEF perform startup. */
+       sef_setcb_init_fresh(sef_cb_init_fresh);
+
+       sef_startup();
 }
 
+/*===========================================================================*
+ *                             main                                         *
+ *===========================================================================*/
+int main(void)
+{
+       /* SEF local startup. */
+       sef_local_startup();
+
+       return 0;
+}

diff --git a/test/ds/inc.h b/test/ds/inc.h
index 2f7907d55bbe0f3d0f2d48da9765822e831314bc..e2ce3b90962e0f2f0394f1d3a240e1148997fe24 100644 (file)
--- a/test/ds/inc.h
+++ b/test/ds/inc.h
@@ -1,4 +1,3 @@
-#define _MINIX
 #define _SYSTEM
 #include <stdio.h>
 #include <unistd.h>

diff --git a/test/ds/run b/test/ds/run
index 46ab1133f67ddaf9291b30ac6699e6911857bf9a..bdb0b309cd0a264d758cef8a3760ea7940d92e3b 100644 (file)
--- a/test/ds/run
+++ b/test/ds/run
@@ -2,5 +2,6 @@
 
 PWD=`pwd`
 
-service up ${PWD}/subs -config ${PWD}/system.conf -script ${PWD}/down
-service up ${PWD}/dstest -config ${PWD}/system.conf -script ${PWD}/down
+service up ${PWD}/subs -config system.conf -script /etc/rs.single
+service up ${PWD}/dstest -config system.conf -script /etc/rs.single
+service down subs

diff --git a/test/ds/subs.c b/test/ds/subs.c
index 7013016a3b7cfe510558c78d2c5812dd09d41fdc..ee774e312a5c9f17e2a6ff691ea4374f81d608c0 100644 (file)
--- a/test/ds/subs.c
+++ b/test/ds/subs.c
@@ -14,7 +14,7 @@ int main(void)
        message mess;
        char key[DS_MAX_KEYLEN];
        int type;
-       unsigned long num;
+       u32_t num;
        char string[17];
        char buf[1000];
        size_t length = 1000;