[LNT] r312056 - lit.cfg/mysql: cleanup

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Aug 29 15:59:25 2017
New Revision: 312056

URL: http://llvm.org/viewvc/llvm-project?rev=312056&view=rev
Log:
lit.cfg/mysql: cleanup

Modified:
    lnt/trunk/tests/SharedInputs/mysql_wrapper.sh
    lnt/trunk/tests/lit.cfg

Modified: lnt/trunk/tests/SharedInputs/mysql_wrapper.sh
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/SharedInputs/mysql_wrapper.sh?rev=312056&r1=312055&r2=312056&view=diff
==============================================================================
--- lnt/trunk/tests/SharedInputs/mysql_wrapper.sh (original)
+++ lnt/trunk/tests/SharedInputs/mysql_wrapper.sh Tue Aug 29 15:59:25 2017
@@ -34,8 +34,6 @@ MYSQL_INSTALL_DB_FLAGS+=" --initialize-i
 MYSQL_INSTALL_DB_FLAGS+=" --user=$(whoami)"
 MYSQL_INSTALL_DB_FLAGS+=" --datadir=\"${DBDIR}/data\""
 MYSQL_INSTALL_DB_FLAGS+=" >& \"${DBDIR}/install_db.log\""
-#echo "$ mysql_install_db ${MYSQL_INSTALL_DB_FLAGS}"
-#eval mysql_install_db ${MYSQL_INSTALL_DB_FLAGS}
 echo "$ mysqld ${MYSQL_INSTALL_DB_FLAGS}"
 eval mysqld ${MYSQL_INSTALL_DB_FLAGS}
 
@@ -68,14 +66,13 @@ set -e
 
 set +e
 # This may not be there if the test has not been run before.
-echo "$ mysqladmin ${MYSQLADMIN_FLAGS} drop testdb"
+echo "$ mysqladmin ${MYSQLADMIN_FLAGS} drop --force testdb"
 eval mysqladmin ${MYSQLADMIN_FLAGS} drop --force testdb
 set -e
 
 echo "$ mysqladmin ${MYSQLADMIN_FLAGS} create testdb"
 eval mysqladmin ${MYSQLADMIN_FLAGS} create testdb
 
-
 # Execute command
 eval "$@"
 RC=$?

Modified: lnt/trunk/tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lit.cfg?rev=312056&r1=312055&r2=312056&view=diff
==============================================================================
--- lnt/trunk/tests/lit.cfg (original)
+++ lnt/trunk/tests/lit.cfg Tue Aug 29 15:59:25 2017
@@ -51,8 +51,8 @@ if lit_config.params.get('long', None):
 if lit_config.params.get('postgres', None):
     config.available_features.add('postgres')
 
-# Enable MySQL testing. This requires mysqladmin binary in PATH, and a server to be running
-# on localhost with user root/no password.
+# Enable MySQL testing. This requires mysqld and mysqladmin binaries in PATH.
+# (You do not need to start a server, the tests will create ad-hoc instances).
 if lit_config.params.get('mysql', None):
     config.available_features.add('mysql')