diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-30 13:08:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-30 13:08:35 -0600 |
| commit | bd286b23f938fcdb39c146e0780e70a26ef3a8ef (patch) | |
| tree | c118de27cb6be208010a6e894daa151a6570edc8 /mysql-test/mysql-test-run.sh | |
| parent | 0a6cf93d23f42b3060b324b7f7a71cfcce7507f9 (diff) | |
| download | mariadb-git-bd286b23f938fcdb39c146e0780e70a26ef3a8ef.tar.gz | |
support for eval_result and let $var = `query` syntax in mysql-test
fixes for rpl_log test to make it config-independent
BitKeeper/etc/ignore:
Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
if we got wrong result on eval_result test case, diff against the
expanded result, not the template
mysql-test/r/rpl_log.result:
change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
get server version from the server
remove obsoleted replace hack to solve port problem - use eval_result
instead
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index eb047f5cf54..4d508883496 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -333,6 +333,13 @@ show_failed_diff () { reject_file=r/$1.reject result_file=r/$1.result + eval_file=r/$1.eval + + if [ -f $eval_file ] + then + result_file=$eval_file + fi + if [ -x "$DIFF" ] && [ -f $reject_file ] then echo "Below are the diffs between actual and expected results:" |