*** empty log message ***

diff --git a/allParam/test/int/i_store.c b/allParam/test/int/i_store.c
index 84ba6e0ef412b9cc2cc05b9f0c1ff83e9294c745..8d576aa913a013238c28365dd71db329b5fe43cc 100644 (file)
--- 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 6ce3dc380465d7687abf7a5b254c3b48f5bb8795..e4d58ec5d4ae7e0d67de4c0130d6570a5481b676 100644 (file)
--- 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 19476498dcdd48f46427f2eafbc43a7be9499474..5bde13408dd02887e736d0e99ac2b8c378c0ad3f 100644 (file)
--- 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 e1c31562f1c4881c56df6d1d25ea7a6490232fb1..c5b2563e4a7e1c08899d95162c120816f9584918 100644 (file)
--- 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 01a34e4972436c23071404b6a51f4596cb87e5b1..df8b87b701683c46f5e4bd844b39eb83ff622a09 100644 (file)
--- 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 088a23567a214676e1148969e1045e86ffb1000b..940602f15a8343bd419e13d20b35109fed9c3860 100644 (file)
--- 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 28ac1ab16cd37c359c58e80ee4634c2530a3cd02..41a4b8cfd011d221374f47091d9166a9f5a0dda8 100644 (file)
--- 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);