Connector/ODBC 3.51 commit: r157 - trunk/test

[mysqldev]

Modified:
   trunk/test/Makefile.am
Log:
Set SYSODBCINI for Mac OS X 10.4 iODBC

Modified: trunk/test/Makefile.am
===================================================================
--- trunk/test/Makefile.am	2007-02-07 23:23:52 UTC (rev 156)
+++ trunk/test/Makefile.am	2007-02-08 00:46:19 UTC (rev 157)
@@ -94,19 +94,26 @@
 
 run: make-test-ini $(plain_tests) my_use_result
 	for test in $(plain_tests); do \
-	  echo ODBCINI=$(TEST_ODBCINI) \
-	    ./$$test "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit 1;
\
-	  ODBCINI=$(TEST_ODBCINI) \
-	    ./$$test "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit 1;
\
+	  echo ODBCINI=$(TEST_ODBCINI) SYSODBCINI=$(TEST_ODBCINI) \
+	    ./$$test "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" ; \
+	  ODBCINI=$(TEST_ODBCINI) SYSODBCINI=$(TEST_ODBCINI) \
+	    ./$$test "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || \
+	    test -n "$(FORCE)" || \
+	    exit 1 ; \
 	done
-	ODBCINI=$(TEST_ODBCINI) ./my_use_result 1000 "$(TEST_DSN)" "$(TEST_UID)"
"$(TEST_PASSWORD)" "$(TEST_SOCKET)"
+	ODBCINI=$(TEST_ODBCINI) SYSODBCINI=$(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 \
-	  echo ODBCINI=$(TEST_ODBCINI) \
-	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit
1; \
-	  ODBCINI=$(TEST_ODBCINI) \
-	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || exit
1; \
+	  echo ODBCINI=$(TEST_ODBCINI) SYSODBCINI=$(TEST_ODBCINI) \
+	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" ; \
+	  ODBCINI=$(TEST_ODBCINI) SYSODBCINI=$(TEST_ODBCINI) \
+	    ./$$test -1 "$(TEST_DSN)" "$(TEST_UID)" "$(TEST_PASSWORD)" "$(TEST_SOCKET)" || \
+	    test -n "$(FORCE)" || \
+	    exit 1 ; \
 	done
 
 #