Connector/ODBC 3.51 commit: r125 - in trunk/test: . test test2 test3

[jwinstead]

Modified:
   trunk/test/Makefile.am
   trunk/test/test/mytest.c
   trunk/test/test2/mytest2.c
   trunk/test/test3/mytest3.c
Log:
Add support for socket argument to mytest, mytest2, and mytest3, and use
it from Makefile.am


Modified: trunk/test/Makefile.am
===================================================================
--- trunk/test/Makefile.am	2006-10-02 20:37:13 UTC (rev 124)
+++ trunk/test/Makefile.am	2006-10-02 21:25:52 UTC (rev 125)
@@ -104,9 +104,9 @@
 trun: make-test-ini $(fancy_tests)
 	for test in $(fancy_tests); do \
 	  echo ODBCINI=$(TEST_ODBCINI) \
-	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" || exit 1; \
+	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit
1; \
 	  ODBCINI=$(TEST_ODBCINI) \
-	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" || exit 1; \
+	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit
1; \
 	done
 
 #

Modified: trunk/test/test/mytest.c
===================================================================
--- trunk/test/test/mytest.c	2006-10-02 20:37:13 UTC (rev 124)
+++ trunk/test/test/mytest.c	2006-10-02 21:25:52 UTC (rev 125)
@@ -16,6 +16,8 @@
  ***************************************************************************/
 #include "mytest3.h"
 
+SQLCHAR *mysock= NULL;
+
 /**
  Simple function to do basic ops with MySQL
 */
@@ -4044,15 +4046,16 @@
                                      !strcmp (argv[1], "--h") ||
                                      !strcmp (argv[1], "--help")
                                     ))
-                    ) || argc > 5
+                    ) || argc > 6
        )
     {
         printMessage("------------------------------------------\n");
-        printMessage("usage: mytest testno [DSN] [UID] [PWD] \n\n");      
+        printMessage("usage: mytest testno [DSN] [UID] [PWD] [SOCK]\n\n");      
         printMessage("       testno <-- test number\n");
         printMessage("       DSN    <-- data source name\n");
         printMessage("       UID    <-- user name\n");
         printMessage("       PWD    <-- password\n");
+        printMessage("       SOCK   <-- socket path\n");
 
         printMessage("\ntestno:\n");            
         printMessage("   -1 : all\n");            
@@ -4087,9 +4090,10 @@
             myuid = argv[3];
         else if ( narg == 4 )
             mypwd = argv[4];
+        else if ( narg == 5 )
+            mysock= argv[5];
+    }
 
-    }   
-
     myconnect(&henv,&hdbc,&hstmt);
     mytest(tno,henv,hdbc,hstmt);
     mytest(tno,henv,hdbc,hstmt);

Modified: trunk/test/test2/mytest2.c
===================================================================
--- trunk/test/test2/mytest2.c	2006-10-02 20:37:13 UTC (rev 124)
+++ trunk/test/test2/mytest2.c	2006-10-02 21:25:52 UTC (rev 125)
@@ -16,6 +16,8 @@
  ***************************************************************************/
 #include "mytest3.h"
 
+SQLCHAR *mysock= NULL;
+
 /**
  Simple function to do basic ops with MySQL
 */
@@ -4064,15 +4066,16 @@
                                      !strcmp (argv[1], "--h") ||
                                      !strcmp (argv[1], "--help")
                                    ))
-                    ) || argc > 5
+                    ) || argc > 6
        )
     {
       printMessage("------------------------------------------\n");
-      printMessage("usage: mytest testno [DSN] [UID] [PWD] \n\n");      
+      printMessage("usage: mytest testno [DSN] [UID] [PWD] [SOCK]\n\n");      
       printMessage("       testno <-- test number\n");
       printMessage("       DSN    <-- data source name\n");
       printMessage("       UID    <-- user name\n");
       printMessage("       PWD    <-- password\n");
+      printMessage("       SOCK   <-- socket path\n");
       
       printMessage("\ntestno:\n");            
       printMessage("   -1 : all\n");            
@@ -4106,9 +4109,10 @@
       else if ( narg == 3 )
         myuid = argv[3];
       else if ( narg == 4 )
-        mypwd = argv[4];      
-          
-    }   
+        mypwd = argv[4];
+      else if ( narg == 5 )
+        mysock= argv[5];
+    }
 
     myconnect(&henv,&hdbc,&hstmt);
     mytest(tno,henv,hdbc,hstmt);

Modified: trunk/test/test3/mytest3.c
===================================================================
--- trunk/test/test3/mytest3.c	2006-10-02 20:37:13 UTC (rev 124)
+++ trunk/test/test3/mytest3.c	2006-10-02 21:25:52 UTC (rev 125)
@@ -6884,7 +6884,7 @@
                                      !strcmp (argv[1], "--h") ||
                                      !strcmp (argv[1], "--help")
                                    ))
-                    ) || argc > 5
+                    ) || argc > 6
        )
     {
       fprintf(stdout,"------------------------------------------\n");
@@ -6928,9 +6928,9 @@
         myuid = argv[3];
       else if ( narg == 4 )
         mypwd = argv[4];
-      else if ( narg == 4 )
-        mysock= argv[4];
-    }   
+      else if ( narg == 5 )
+        mysock= argv[5];
+    }
 
     myconnect(&henv,&hdbc,&hstmt);
     mytest(tno,henv,hdbc,hstmt);