Connector/ODBC 3.51 commit: r194 - in trunk/test: . use_result

[jwinstead]

Modified:
   trunk/test/Makefile.am
   trunk/test/use_result/my_use_result.c
Log:
Move extra argument for my_use_result to the end of the command line, so it
behaves like the other tests and doesn't need special handling for 'make test'.


Modified: trunk/test/Makefile.am
===================================================================
--- trunk/test/Makefile.am	2007-02-21 19:00:17 UTC (rev 193)
+++ trunk/test/Makefile.am	2007-02-21 19:06:10 UTC (rev 194)
@@ -38,14 +38,14 @@
 my_tran_ext \
 my_catalog \
 my_error \
-mytest32
+mytest32 \
+my_use_result
 fancy_tests= \
 mytest \
 mytest2 \
 mytest3
 odd_tests= \
-dbtest \
-my_use_result
+dbtest
 
 noinst_PROGRAMS= $(plain_tests) $(fancy_tests) $(odd_tests)
 
@@ -96,7 +96,7 @@
 # Pass DSN UID PASSWORD as the command line arguments to each sample
 # ----------------------------------------------------------------------
 
-run: make-test-ini $(plain_tests) my_use_result
+run: make-test-ini $(plain_tests)
 	for test in $(plain_tests); do \
 	  echo test: $$test; \
 	  echo ODBCINI=$(TEST_ODBCINI) \
@@ -106,11 +106,6 @@
 	    test -n "$(FORCE)" || \
 	    exit 1 ; \
 	done
-	echo test: my_use_result
-	ODBCINI=$(TEST_ODBCINI) ./my_use_result 1000 "$(TEST_DSN)" "$(TEST_UID)" \
-	"$(TEST_PASSWORD)" "$(TEST_SOCKET)" || \
-	test -n "$(FORCE)" || \
-	exit 1
 
 trun: make-test-ini $(fancy_tests)
 	for test in $(fancy_tests); do \

Modified: trunk/test/use_result/my_use_result.c
===================================================================
--- trunk/test/use_result/my_use_result.c	2007-02-21 19:00:17 UTC (rev 193)
+++ trunk/test/use_result/my_use_result.c	2007-02-21 19:06:10 UTC (rev 194)
@@ -18,7 +18,7 @@
 
 SQLCHAR *mysock= NULL;
 
-SQLINTEGER my_max_rows = 10000;
+SQLINTEGER my_max_rows = 1000;
 clock_t t_start, t_end;
 SQLDOUBLE my_time;
 
@@ -199,15 +199,15 @@
     for (narg = 1; narg < argc; narg++)
     {
         if ( narg == 1 )
-            my_max_rows = atoi(argv[1]);
+            mydsn = argv[1];
         else if ( narg == 2 )
-            mydsn = argv[2];
+            myuid = argv[2];
         else if ( narg == 3 )
-            myuid = argv[3];
+            mypwd = argv[3];
         else if ( narg == 4 )
-            mypwd = argv[4];
+            mysock= argv[4];
         else if ( narg == 5 )
-            mysock= argv[5];
+            my_max_rows = atoi(argv[5]);
     }
 
     t_init_data();