From: hades <hades>
Date: Fri, 8 Sep 2000 16:56:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=74845da1fe399f1ae6e0b3f5599916ad78162fad;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/Makefile b/allParam/Makefile
index c113f28..367847b 100644
--- a/allParam/Makefile
+++ b/allParam/Makefile
@@ -35,15 +35,15 @@ $(PARAMLIBES) :
 	cd $@ ; $(MAKE)
 
 ca_install :
-	cd ca ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/ca"
+	cd ca ; $(MAKE) install "LIBDIR=$(LIBDIR)" "INCDIR=$(INCDIR)/ca"
 file_install :
-	cd file ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/file"
+	cd file ; $(MAKE) install "LIBDIR=$(LIBDIR)" "INCDIR=$(INCDIR)/file"
 ora_install :
-	cd ora ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/ora"
+	cd ora ; $(MAKE) install "LIBDIR=$(LIBDIR)" "INCDIR=$(INCDIR)/ora"
 psql_install :
-	cd psql ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/psql"
+	cd psql ; $(MAKE) install "LIBDIR=$(LIBDIR)" "INCDIR=$(INCDIR)/psql"
 tcl_install :
-	cd tcl ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/tcl"
+	cd tcl ; $(MAKE) install "LIBDIR=$(LIBDIR)" "INCDIR=$(INCDIR)/tcl"
 
 $(TESTS) :
 	cd test ; $(MAKE) $@
@@ -65,4 +65,5 @@ lib_clean :
 	cd test ; $(MAKE) bin_clean
 
 $(PARAMLIBES) test : dummy
+dummy :
 
diff --git a/allParam/test/Makefile b/allParam/test/Makefile
index 7f529cf..d3f1c12 100644
--- a/allParam/test/Makefile
+++ b/allParam/test/Makefile
@@ -31,8 +31,6 @@ OBJS = suite.o $(addsuffix .o,$(TESTS))
 
 LIBS = ca file ora psql tcl
 
-suite : $(addsuffix _suite,$(LIBS))
-
 ca_test file_test ora_test psql_test tcl_test :
 	$(RM) $@_suite
 	$(MAKE) $@_suite
@@ -74,7 +72,7 @@ $(addprefix tcl_,$(OBJS)) :
 	$(MV) $(patsubst tcl_%,%,$@) $@
 
 suite.o : suite.c $(addsuffix .h, $(TESTS))
-	$(CC) -c $(CFLAGS) $(suite.c,$@) -o $@
+	$(CC) -c $(CFLAGS) suite.c -o $@
 $(addsuffix .o, $(TESTS)) : $(patsubst %.o,%.c,$@) $(patsubst %.o,%.h,$@)
 	$(CC) -c $(CFLAGS) $(patsubst %.o,%.c,$@) -o $@
 
@@ -85,4 +83,5 @@ bin_clean :
 	rm *.o *_suite *test_protocol.txt sqlnet.log
 
 ca_test file_test ora_test psql_test tcl_test : dummy
+dummy :
 
diff --git a/allParam/test/test13.c b/allParam/test/test13.c
index 90d9d5a..8339126 100644
--- a/allParam/test/test13.c
+++ b/allParam/test/test13.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
diff --git a/allParam/test/test14.c b/allParam/test/test14.c
index 631c5ae..704bdcd 100644
--- a/allParam/test/test14.c
+++ b/allParam/test/test14.c
@@ -10,7 +10,6 @@ int test14(const char *testid, const Param *param) {
 	char *idx = "blub";
 	unsigned long int result[NUM2];
 	int rows;
-	int i;
 	int retVal;
 	int myRetVal;
 
diff --git a/allParam/test/test15.c b/allParam/test/test15.c
index a5561b2..2e09c66 100644
--- a/allParam/test/test15.c
+++ b/allParam/test/test15.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
diff --git a/allParam/test/test17.c b/allParam/test/test17.c
index b7ec3c3..6d0089d 100644
--- a/allParam/test/test17.c
+++ b/allParam/test/test17.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
diff --git a/allParam/test/test19.c b/allParam/test/test19.c
index 4a79ee6..29deeef 100644
--- a/allParam/test/test19.c
+++ b/allParam/test/test19.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
@@ -21,38 +22,38 @@ int test19(const char *testid, const Param *param) {
 
 	retVal = Param_getStringArray(param, name, idx, NUM2, &rows, result);
 	if ((rows == NUM2) &&
-		result[0] && (strcmp(result[0], "0") == 0) &&
+		result[0] && (strcmp(result[0], "1") == 0) &&
 		result[1] && (strcmp(result[1], "0") == 0) &&
-		result[2] && (strcmp(result[2], "0") == 0) &&
-		result[3] && (strcmp(result[3], "0") == 0) &&
-		result[4] && (strcmp(result[4], "0") == 0) &&
-		result[5] && (strcmp(result[5], "0") == 0) &&
-		result[6] && (strcmp(result[6], "0") == 0) &&
-		result[7] && (strcmp(result[7], "0") == 0) &&
-		result[8] && (strcmp(result[8], "0") == 0) &&
-		result[9] && (strcmp(result[9], "0") == 0) &&
-		result[10] && (strcmp(result[10], "0") == 0) &&
-		result[11] && (strcmp(result[11], "0") == 0) &&
-		result[12] && (strcmp(result[12], "0") == 0) &&
-		result[13] && (strcmp(result[13], "0") == 0) &&
-		result[14] && (strcmp(result[14], "0") == 0) &&
-		result[15] && (strcmp(result[15], "0") == 0) &&
-		result[16] && (strcmp(result[16], "0") == 0) &&
-		result[17] && (strcmp(result[17], "0") == 0) &&
-		result[18] && (strcmp(result[18], "0") == 0) &&
-		result[19] && (strcmp(result[19], "0") == 0) &&
-		result[20] && (strcmp(result[20], "0") == 0) &&
-		result[21] && (strcmp(result[21], "0") == 0) &&
-		result[22] && (strcmp(result[22], "0") == 0) &&
-		result[23] && (strcmp(result[23], "0") == 0) &&
-		result[24] && (strcmp(result[24], "0") == 0) &&
-		result[25] && (strcmp(result[25], "0") == 0) &&
-		result[26] && (strcmp(result[26], "0") == 0) &&
-		result[27] && (strcmp(result[27], "0") == 0) &&
-		result[28] && (strcmp(result[28], "0") == 0) &&
-		result[29] && (strcmp(result[29], "0") == 0) &&
-		result[30] && (strcmp(result[30], "0") == 0) &&
-		result[31] && (strcmp(result[31], "0") == 0) &&
+		result[2] && (strcmp(result[2], "3") == 0) &&
+		result[3] && (strcmp(result[3], "2") == 0) &&
+		result[4] && (strcmp(result[4], "5") == 0) &&
+		result[5] && (strcmp(result[5], "4") == 0) &&
+		result[6] && (strcmp(result[6], "7") == 0) &&
+		result[7] && (strcmp(result[7], "6") == 0) &&
+		result[8] && (strcmp(result[8], "9") == 0) &&
+		result[9] && (strcmp(result[9], "8") == 0) &&
+		result[10] && (strcmp(result[10], "11") == 0) &&
+		result[11] && (strcmp(result[11], "10") == 0) &&
+		result[12] && (strcmp(result[12], "13") == 0) &&
+		result[13] && (strcmp(result[13], "12") == 0) &&
+		result[14] && (strcmp(result[14], "15") == 0) &&
+		result[15] && (strcmp(result[15], "14") == 0) &&
+		result[16] && (strcmp(result[16], "17") == 0) &&
+		result[17] && (strcmp(result[17], "16") == 0) &&
+		result[18] && (strcmp(result[18], "19") == 0) &&
+		result[19] && (strcmp(result[19], "18") == 0) &&
+		result[20] && (strcmp(result[20], "21") == 0) &&
+		result[21] && (strcmp(result[21], "20") == 0) &&
+		result[22] && (strcmp(result[22], "23") == 0) &&
+		result[23] && (strcmp(result[23], "22") == 0) &&
+		result[24] && (strcmp(result[24], "25") == 0) &&
+		result[25] && (strcmp(result[25], "24") == 0) &&
+		result[26] && (strcmp(result[26], "27") == 0) &&
+		result[27] && (strcmp(result[27], "26") == 0) &&
+		result[28] && (strcmp(result[28], "29") == 0) &&
+		result[29] && (strcmp(result[29], "28") == 0) &&
+		result[30] && (strcmp(result[30], "31") == 0) &&
+		result[31] && (strcmp(result[31], "30") == 0) &&
 		(retVal == 0)) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
diff --git a/allParam/test/test20.c b/allParam/test/test20.c
index 9397c07..816b108 100644
--- a/allParam/test/test20.c
+++ b/allParam/test/test20.c
@@ -10,7 +10,6 @@ int test20(const char *testid, const Param *param) {
 	char *idx = "fefpgafile";
 	unsigned long int result[NUM1];
 	int rows;
-	int i;
 	int retVal;
 	int myRetVal;
 
diff --git a/allParam/test/test21.c b/allParam/test/test21.c
index 6865f84..f9d4860 100644
--- a/allParam/test/test21.c
+++ b/allParam/test/test21.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
@@ -24,7 +25,7 @@ int test21(const char *testid, const Param *param) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
 	} else {
-		printf("%s : Failed. Rows: %d, result: \'%s\', return Value: %d.\n", testid, rows, result, retVal);
+		printf("%s : Failed. Rows: %d, result: \'%s\', return Value: %d.\n", testid, rows, result[0], retVal);
 		printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 		myRetVal = -1;
 	}
diff --git a/allParam/test/test22.c b/allParam/test/test22.c
index 7784ea9..274db84 100644
--- a/allParam/test/test22.c
+++ b/allParam/test/test22.c
@@ -12,7 +12,6 @@ int test22(const char *testid, const Param *param) {
 	int rows;
 	int retVal;
 	int myRetVal;
-	int i;
 
 	printf("%s : Param_getString: Request for Array value.\n", testid);
 
diff --git a/allParam/test/test3.c b/allParam/test/test3.c
index 3610ff4..fff0c2e 100644
--- a/allParam/test/test3.c
+++ b/allParam/test/test3.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
diff --git a/allParam/test/test7.c b/allParam/test/test7.c
index 77ccc2a..7a4d2d3 100644
--- a/allParam/test/test7.c
+++ b/allParam/test/test7.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <param.h>
 
diff --git a/allParam/test/test8.h b/allParam/test/test8.h
index 95e178d..80127ae 100644
--- a/allParam/test/test8.h
+++ b/allParam/test/test8.h
@@ -1,10 +1,10 @@
-#ifndef TEST4_H
-#define TEST4_H
+#ifndef TEST8_H
+#define TEST8_H
 
 #include <param.h>
 
 #define NUM2 32
 
-int test4(const char *, const Param *);
+int test8(const char *, const Param *);
 
 #endif