summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@booka.opbmk>2007-02-24 13:12:20 +0300
committerunknown <anozdrin/alik@booka.opbmk>2007-02-24 13:12:20 +0300
commitf44759c71d870585b661ff6e6aa746a3c1fa4ede (patch)
treefb3122e04ed259507ff0858e958eb5c46c7a42cf
parent94d4f324eca7dade5c18fa3ed567a8f624e7e1ba (diff)
downloadmariadb-git-f44759c71d870585b661ff6e6aa746a3c1fa4ede.tar.gz
IM test suite fix.
Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/kill_n_check.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/log.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/wait_for_process.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log. mysql-test/t/wait_for_socket.sh: Log messages from shell-scripts were put to var/log/<test id>.log file. Now, this file is used by mysql-test-run.pl. So, move log messages to var/log/<test id>.script.log.
-rwxr-xr-xmysql-test/t/kill_n_check.sh2
-rwxr-xr-xmysql-test/t/log.sh2
-rwxr-xr-xmysql-test/t/wait_for_process.sh2
-rwxr-xr-xmysql-test/t/wait_for_socket.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/kill_n_check.sh b/mysql-test/t/kill_n_check.sh
index 96c402a638c..6f2a0825dcd 100755
--- a/mysql-test/t/kill_n_check.sh
+++ b/mysql-test/t/kill_n_check.sh
@@ -53,7 +53,7 @@ pid_path="$1"
expected_result="$2"
total_timeout="$3"
test_id="$4"
-log_file="$MYSQLTEST_VARDIR/log/$test_id.log"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
log_debug "-- $basename: starting --"
log_debug "pid_path: '$pid_path'"
diff --git a/mysql-test/t/log.sh b/mysql-test/t/log.sh
index 29cf8d3e1a3..33ef6d6701f 100755
--- a/mysql-test/t/log.sh
+++ b/mysql-test/t/log.sh
@@ -17,7 +17,7 @@ if [ $# -lt 2 ]; then
fi
test_id="$1"
-log_file="$MYSQLTEST_VARDIR/log/$test_id.log"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
shift
diff --git a/mysql-test/t/wait_for_process.sh b/mysql-test/t/wait_for_process.sh
index 4c2d89cfea6..2143ab2002f 100755
--- a/mysql-test/t/wait_for_process.sh
+++ b/mysql-test/t/wait_for_process.sh
@@ -63,7 +63,7 @@ pid_path="$1"
total_attempts="$2"
event="$3"
test_id="$4"
-log_file="$MYSQLTEST_VARDIR/log/$test_id.log"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
log_debug "-- $basename: starting --"
log_debug "pid_path: '$pid_path'"
diff --git a/mysql-test/t/wait_for_socket.sh b/mysql-test/t/wait_for_socket.sh
index 1bce74dfd3a..8c17c8ac0ac 100755
--- a/mysql-test/t/wait_for_socket.sh
+++ b/mysql-test/t/wait_for_socket.sh
@@ -30,7 +30,7 @@ password="$4"
db="$5"
total_timeout="$6"
test_id="$7"
-log_file="$MYSQLTEST_VARDIR/log/$test_id.log"
+log_file="$MYSQLTEST_VARDIR/log/$test_id.script.log"
log_debug "-- $basename: starting --"
log_debug "client_exe: '$client_exe'"