cmd: Make the original test suite build

Make the original, command line driven, test suite build again

Change-Id: I57f0ebb5b1d13acf0809c7fa005e3556e3edb798
Reviewed-on: http://gerrit.openafs.org/4537
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/cmd/test/.gitignore b/src/cmd/test/.gitignore
new file mode 100644 (file)
index 0000000..128ca68
--- /dev/null
+++ b/src/cmd/test/.gitignore
@@ -0,0 +1,3 @@
+ctest
+dtest
+itest

diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in
index d1bdb43b19aac4ce56ef2e41f4f199bf10f60e57..934ec64c38efa6b5f6c66dfe7d2719e5358b5765 100644 (file)
--- a/src/cmd/test/Makefile.in
+++ b/src/cmd/test/Makefile.in
@@ -14,8 +14,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
-LIBS=-lcmd -lcom_err -lafsutil
+LIBS=-lcmd $(TOP_LIBDIR)/libcom_err.a -lafsutil $(LIB_roken) $(XLIBS)
 
 all: test
 test tests: ctest dtest itest

diff --git a/src/cmd/test/ctest.c b/src/cmd/test/ctest.c
index 5e0ef76f87c2ad9ee564c961ef189e39422dbc7f..e9220c8a597ac9cf6b18cf38e58886d2dfdf483a 100644 (file)
--- a/src/cmd/test/ctest.c
+++ b/src/cmd/test/ctest.c
@@ -10,9 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "cmd.h"
-#include <stdio.h>
+#include <afs/cmd.h>
 
 static int
 cproc1(struct cmd_syndesc *as, void *arock)

diff --git a/src/cmd/test/dtest.c b/src/cmd/test/dtest.c
index a5201da3691b9d37e7877751ef163de3dff3413e..4ab45742d7b0450b7da7738232a4c8b7377eb74a 100644 (file)
--- a/src/cmd/test/dtest.c
+++ b/src/cmd/test/dtest.c
@@ -10,9 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "cmd.h"
-#include <stdio.h>
+#include <afs/cmd.h>
 
 static int
 cproc(struct cmd_syndesc *as, void *arock)

diff --git a/src/cmd/test/itest.c b/src/cmd/test/itest.c
index 5f402aafbabcdcf7366f3d46372ea5f0dd0513bc..bb0eaf6315db863b0905003ba0aae09905fe8a47 100644 (file)
--- a/src/cmd/test/itest.c
+++ b/src/cmd/test/itest.c
@@ -10,10 +10,10 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include "cmd.h"
-#include <stdio.h>
-#include <com_err.h>
+#include <afs/com_err.h>
+#include <afs/cmd.h>
 
 static int
 cproc1(struct cmd_syndesc *as, void *arock)
@@ -49,7 +49,7 @@ main(int argc, char **argv)
 {
     struct cmd_syndesc *ts;
     char tline[1000];
-    long tc;
+    afs_int32 tc;
     char *tp;
     long code;
     char *tv[100];