From d1205481f045b52388c75351a32459a175257df0 Mon Sep 17 00:00:00 2001
From: hades <hades>
Date: Fri, 30 Mar 2001 14:17:41 +0000
Subject: [PATCH] *** empty log message ***

---
 allParam/test/int/i_store.c               | 4 ++--
 allParam/test/int/i_store_existing.c      | 4 ++--
 allParam/test/int/i_store_multiple.c      | 4 ++--
 allParam/test/string/s_store.c            | 8 ++++----
 allParam/test/string/s_store_existing.c   | 8 ++++----
 allParam/test/string/s_store_multiple.c   | 8 ++++----
 allParam/test/string/s_store_whitespace.c | 8 ++++----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/allParam/test/int/i_store.c b/allParam/test/int/i_store.c
index 84ba6e0..8d576aa 100644
--- a/allParam/test/int/i_store.c
+++ b/allParam/test/int/i_store.c
@@ -34,9 +34,9 @@ int i_store(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (result == tostore) && (retVal1 == 0) && (retVal2 == 0)) {
-		if(system("diff i_store_s.tcl i_store.tcl")) {
+		if(system("diff i_store_s.tcl tcl/i_store.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"%s_s.tcl\" and \"%s.tcl\" differ.\n", testid, testid, testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
diff --git a/allParam/test/int/i_store_existing.c b/allParam/test/int/i_store_existing.c
index 6ce3dc3..e4d58ec 100644
--- a/allParam/test/int/i_store_existing.c
+++ b/allParam/test/int/i_store_existing.c
@@ -34,9 +34,9 @@ int i_store_existing(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (result == tostore) && (retVal1 == 0) && (retVal2 == 0)) {
-		if(system("diff i_store_existing_s.tcl i_store_existing.tcl")) {
+		if(system("diff i_store_existing_s.tcl tcl/i_store_existing.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"%s_s.tcl\" and \"%s.tcl\" differ.\n", testid, testid, testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
diff --git a/allParam/test/int/i_store_multiple.c b/allParam/test/int/i_store_multiple.c
index 1947649..5bde134 100644
--- a/allParam/test/int/i_store_multiple.c
+++ b/allParam/test/int/i_store_multiple.c
@@ -37,9 +37,9 @@ int i_store_multiple(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (result == new) && (retVal1 == 0) && (retVal2 == 0) && (retVal3 == 0)) {
-		if(system("diff i_store_multiple_s.tcl i_store_multiple.tcl")) {
+		if(system("diff i_store_multiple_s.tcl tcl/i_store_multiple.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"%s_s.tcl\" and \"%s.tcl\" differ.\n", testid, testid, testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
diff --git a/allParam/test/string/s_store.c b/allParam/test/string/s_store.c
index e1c3156..c5b2563 100644
--- a/allParam/test/string/s_store.c
+++ b/allParam/test/string/s_store.c
@@ -22,10 +22,10 @@ int s_store(const char *testid) {
 	printf("%s : Param_storeString: Simple.\n", testid);
 #endif
 
-	truncate("storage.tcl", 0);
+	truncate("s_store_s.tcl", 0);
 
 	param = malloc(sizeof(Param));
-	conParam(param);
+	conSetupParam(param, testid);
 
 	retVal1 = Param_storeString(param, name, idx, tostore);
 	retVal2 = Param_getString(param, name, idx, &rows, result);
@@ -34,9 +34,9 @@ int s_store(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (strcmp(result, tostore) == 0) && (retVal1 == 0) && (retVal2 == 0)) {
-		if(system("diff storage.tcl s_store.tcl")) {
+		if(system("diff s_store_s.tcl tcl/s_store.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"storage.tcl\" and \"s_store.tcl\" differ.\n", testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
diff --git a/allParam/test/string/s_store_existing.c b/allParam/test/string/s_store_existing.c
index 01a34e4..df8b87b 100644
--- a/allParam/test/string/s_store_existing.c
+++ b/allParam/test/string/s_store_existing.c
@@ -22,10 +22,10 @@ int s_store_existing(const char *testid) {
 	printf("%s : Param_storeString: Store a Parameter already existing in the source.\n", testid);
 #endif
 
-	truncate("storage.tcl", 0);
+	truncate("s_store_existing_s.tcl", 0);
 
 	param = malloc(sizeof(Param));
-	conParam(param);
+	conSetupParam(param, testid);
 
 	retVal1 = Param_storeString(param, name, idx, tostore);
 	retVal2 = Param_getString(param, name, idx, &rows, result);
@@ -34,9 +34,9 @@ int s_store_existing(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (strcmp(result, tostore) == 0) && (retVal1 == 0) && (retVal2 == 0)) {
-		if(system("diff storage.tcl s_store_existing.tcl")) {
+		if(system("diff s_store_existing_s.tcl tcl/s_store_existing.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"storage.tcl\" and \"s_store_existing.tcl\" differ.\n", testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
diff --git a/allParam/test/string/s_store_multiple.c b/allParam/test/string/s_store_multiple.c
index 088a235..940602f 100644
--- a/allParam/test/string/s_store_multiple.c
+++ b/allParam/test/string/s_store_multiple.c
@@ -24,10 +24,10 @@ int s_store_multiple(const char *testid) {
 	printf("%s : Param_storeString: Storing a value multiple.\n", testid);
 #endif
 
-	truncate("storage.tcl", 0);
+	truncate("s_store_multiple_s.tcl", 0);
 
 	param = malloc(sizeof(Param));
-	conParam(param);
+	conSetupParam(param, testid);
 
 	retVal1 = Param_storeString(param, name, idx, old);
 	retVal2 = Param_storeString(param, name, idx, new);
@@ -37,9 +37,9 @@ int s_store_multiple(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (strcmp(result, new) == 0) && (retVal1 == 0) && (retVal2 == 0) && (retVal3 == 0)) {
-		if(system("diff storage.tcl s_store_multiple.tcl")) {
+		if(system("diff s_store_multiple_s.tcl tcl/s_store_multiple.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"storage.tcl\" and \"s_store_multiple.tcl\" differ.\n", testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
diff --git a/allParam/test/string/s_store_whitespace.c b/allParam/test/string/s_store_whitespace.c
index 28ac1ab..41a4b8c 100644
--- a/allParam/test/string/s_store_whitespace.c
+++ b/allParam/test/string/s_store_whitespace.c
@@ -22,10 +22,10 @@ int s_store_whitespace(const char *testid) {
 	printf("%s : Param_storeString: Store a string containing a whitespace.\n", testid);
 #endif
 
-	truncate("storage.tcl", 0);
+	truncate("s_store_whitespace_s.tcl", 0);
 
 	param = malloc(sizeof(Param));
-	conParam(param);
+	conSetupParam(param, testid);
 
 	retVal1 = Param_storeString(param, name, idx, tostore);
 	retVal2 = Param_getString(param, name, idx, &rows, result);
@@ -34,9 +34,9 @@ int s_store_whitespace(const char *testid) {
 	free(param);
 
 	if ((rows == 1) && result && (strcmp(result, tostore) == 0) && (retVal1 == 0) && (retVal2 == 0)) {
-		if(system("diff storage.tcl s_store_whitespace.tcl")) {
+		if(system("diff s_store_whitespace_s.tcl tcl/s_store_whitespace.tcl")) {
 #ifdef VERBOSE
-			printf("%s : Failed: Files \"storage.tcl\" and \"s_store_whitespace.tcl\" differ.\n", testid);
+			printf("%s : Failed: Files \"%s_s.tcl\" and \"tcl/%s.tcl\" differ.\n", testid, testid, testid);
 			printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 			printf("%s : Failed.\n", testid);
-- 
2.43.0