diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-13 15:46:11 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-13 15:46:11 +0200 |
| commit | 65fa527a27df355d9e06a812dea02459566a0b35 (patch) | |
| tree | dbe6dbd8c9bcc9e4eb56bec17850ef2d70550e7e /mysql-test/t/mysqltest.test | |
| parent | c2f6f8b6aa86fb719419c2a1d574015ab1e1ecd2 (diff) | |
| download | mariadb-git-65fa527a27df355d9e06a812dea02459566a0b35.tar.gz | |
Improve error messages
Write test results to var/log
Add test for "source" and variable expansion
client/mysqltest.c:
Improve error messages
Write .reject file to the location specified by --logdir
mysql-test/mysql-test-run.pl:
Pass logdir to mysqltest, to get test results written to var/log
mysql-test/r/mysqltest.result:
Update test results
mysql-test/t/mysqltest.test:
Add test for "source" and variable expansion
Update test after writing result in var/log
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 70d5e2ee1ee..8a38972c00f 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -854,6 +854,19 @@ while ($num) --remove_file $MYSQLTEST_VARDIR/tmp/sourced.inc +--write_file $MYSQLTEST_VARDIR/tmp/sourced.inc +echo "hello"; +EOF + +let $x= sourced; +source $MYSQLTEST_VARDIR/tmp/$x.inc; + +let $x= $MYSQLTEST_VARDIR; +source $x/tmp/sourced.inc; + +--remove_file $MYSQLTEST_VARDIR/tmp/sourced.inc + + # ---------------------------------------------------------------------------- # Test sleep command # ---------------------------------------------------------------------------- @@ -1422,7 +1435,7 @@ select "this will be executed"; --exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql -R $MYSQLTEST_VARDIR/tmp/zero_length_file.result > /dev/null 2>&1 remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.result; -remove_file $MYSQLTEST_VARDIR/tmp/zero_length_file.reject; +remove_file $MYSQLTEST_VARDIR/log/zero_length_file.reject; # # Test that a test file that does not generate any output fails. @@ -1490,7 +1503,7 @@ drop table t1; --exec test -s $MYSQLTEST_VARDIR/tmp/bug11731.out drop table t1; remove_file $MYSQLTEST_VARDIR/tmp/bug11731.out; -remove_file $MYSQLTEST_VARDIR/tmp/bug11731.log; +remove_file $MYSQLTEST_VARDIR/log/bug11731.log; remove_file $MYSQLTEST_VARDIR/tmp/bug11731.sql; # |