Needs one bit of work in file.test:
The only issue is that the .result file contains the actual DRIZZLETEST_VARDIR value
This needs to be fixed either with disable_query_log to keep the output of the .result file (though echo output should indicate the action is being performed) or via the replace_result function to mask the actual DRIZZLETEST_VARDIR value (you'll need to capture it early in the test like:
actual_vardir_value = $DRIZZLETEST_VARDIR
...
--replace_result $actual_vardir_value DRIZZLETEST_VARDIR
replace_result would be preferable, but anything to eliminate the capture of a hard variable value in the .result file is good (so the test can run on anyone's machine regardless of where DRIZZLETEST_VARDIR may be)
=== modified file 'plugin/logging_query/tests/t/file.test'
--- plugin/logging_query/tests/t/file.test 2012-09-21 22:52:11 +0000
+++ plugin/logging_query/tests/t/file.test 2012-10-08 16:52:26 +0000
@@ -80,6 +80,11 @@
--echo cleaning up...
SET GLOBAL logging_query_enable=false;
SET GLOBAL logging_query_pcre="*";
+# Here is where you either need to use:
+# disable_query_log, enable_query_log OR
+# replace_result from_val to_val [from_val to_val] ...
+# to capture what DRIZZLETEST_VARDIR really is and to mask it
+
eval SET GLOBAL logging_query_filename="$DRIZZLETEST_VARDIR/logging_query.log";
--exec rm $DRIZZLETEST_VARDIR/logging_query.log
--echo ***done***
Needs one bit of work in file.test: vardir_ value DRIZZLETEST_VARDIR
The only issue is that the .result file contains the actual DRIZZLETEST_VARDIR value
This needs to be fixed either with disable_query_log to keep the output of the .result file (though echo output should indicate the action is being performed) or via the replace_result function to mask the actual DRIZZLETEST_VARDIR value (you'll need to capture it early in the test like:
actual_vardir_value = $DRIZZLETEST_VARDIR
...
--replace_result $actual_
replace_result would be preferable, but anything to eliminate the capture of a hard variable value in the .result file is good (so the test can run on anyone's machine regardless of where DRIZZLETEST_VARDIR may be)
=== modified file 'plugin/ logging_ query/tests/ t/file. test' logging_ query/tests/ t/file. test 2012-09-21 22:52:11 +0000 logging_ query/tests/ t/file. test 2012-10-08 16:52:26 +0000 query_enable= false; query_pcre= "*"; query_filename= "$DRIZZLETEST_ VARDIR/ logging_ query.log" ; VARDIR/ logging_ query.log
--- plugin/
+++ plugin/
@@ -80,6 +80,11 @@
--echo cleaning up...
SET GLOBAL logging_
SET GLOBAL logging_
+# Here is where you either need to use:
+# disable_query_log, enable_query_log OR
+# replace_result from_val to_val [from_val to_val] ...
+# to capture what DRIZZLETEST_VARDIR really is and to mask it
+
eval SET GLOBAL logging_
--exec rm $DRIZZLETEST_
--echo ***done***