[Help-smalltalk] [PATCH] Parameterize --enable-mysql-tests

[Paolo Bonzini]

This adds a generic "variable" functionality to the SUnit scripter. 
This allows to parameterize --enable-mysql-tests=USER:PASSWORD:DB (the 
default is user=root, password=root if no user specified and empty 
otherwise, db=test).

Paolo

* looking for address@hidden/smalltalk--devo--2.2--patch-524 to compare with
* comparing to address@hidden/smalltalk--devo--2.2--patch-524
M  tests/atlocal.in
M  tests/testsuite.at
M  tests/local.at
M  tests/testsuite
M  packages/sunit/SUnitScriptTests.st
M  configure.ac
M  packages/glorp/GlorpTest.st
M  packages/mysql/MySQLTests.st
M  doc/gst.texi
M  packages/sunit/SUnitScript.st

* modified files

--- orig/configure.ac
+++ mod/configure.ac
@@ -299,8 +299,8 @@ GST_PACKAGE_ENABLE([Digest], [digest], [
 GST_PACKAGE_ENABLE([MySQL], [mysql])
 AC_MSG_CHECKING([whether to run MySQL tests])
 AC_ARG_ENABLE(mysql-tests,
-[  --enable-mysql-tests   test MySQL bindings, require user "root" with
-                          password "root", plus database "test"], ,
+[  --enable-mysql-tests=USER:PWD:DATABASE
+                          test MySQL bindings [default=root:root:test]], ,
 [enable_mysql_tests=no])
 AC_SUBST(enable_mysql_tests)
 


--- orig/doc/gst.texi
+++ mod/doc/gst.texi
@@ -2501,6 +2501,8 @@ All of these objects are suitable for be
 retrieved.  You can easily store a suite, then bring it in and run it,
 comparing results with previous runs.
 
address@hidden Running testsuites from the command line
+
 @gst{} includes a Smalltalk script to simplify running SUnit test suites.
 It is called @command{gst-sunit}.  The command-line to @command{gst-sunit}
 specifies the packages, files and classes to test:
@@ -2535,6 +2537,20 @@ Add @var{CLASS} to the set of test cases
 name adds all the classes in @var{CLASS}'s hierarchy.  In particular,
 each selector whose name starts with @code{test} constitutes a separate
 test case.
+
address@hidden @address@hidden
+Associate variable @var{VAR} with a value.  Variables allow customization
+of the testing environment.  For example, the username with which to access
+a database can be specified with variables.  From within a test, variables
+are accessible with code like this:
+
address@hidden
+    TestSuitesScripter variableAt: 'mysqluser' ifAbsent: [ 'root' ]
address@hidden example
+
+Note that a @code{#variableAt:} variant does @emph{not} exist, because
+the testsuite should pick default values in case the variables are
+not specified by the user.
 @end table
 
 @node Network support


--- orig/packages/glorp/GlorpTest.st
+++ mod/packages/glorp/GlorpTest.st
@@ -2221,11 +2221,19 @@ defaultMysqlLogin
     "To set the default database login to MySQL, execute the following 
statement."
     "DefaultLogin := self defaultMysqlLogin."
 
+    | user password db isUser |
+    user := TestSuitesScripter variableAt: 'mysqluser' ifAbsent: [ nil ].
+    isUser := user notNil.
+    isUser ifFalse: [ user := 'root' ].
+    password := TestSuitesScripter variableAt: 'mysqlpassword' ifAbsent: [
+       isUser ifTrue: [ nil ] ifFalse: [ 'root' ] ].
+    db := TestSuitesScripter variableAt: 'mysqldb' ifAbsent: [ 'test' ].
+
     ^(Login new)
        database: MySQLPlatform new;
-       username: 'root';
-       password: 'root';
-       connectString: 'test'.! !
+       username: user;
+       password: password;
+       connectString: db! !
 
 !GlorpDatabaseLoginResource class methodsFor: 'LICENSE'!
 


--- orig/packages/mysql/MySQLTests.st
+++ mod/packages/mysql/MySQLTests.st
@@ -250,11 +250,22 @@ writeFieldDefinitionFor: aType on: aWrit
 !JdmMysqlTestSupport methodsFor: 'accessing'!
 
 connectionSpec
+       | user password db isUser |
+       user := TestSuitesScripter variableAt: 'mysqluser' ifAbsent: [ nil ].
+       isUser := user notNil.
+       isUser ifFalse: [ user := 'root' ].
+       password := TestSuitesScripter variableAt: 'mysqlpassword' ifAbsent: [
+           isUser ifTrue: [ nil ] ifFalse: [ 'root' ] ].
+       db := TestSuitesScripter variableAt: 'mysqldb' ifAbsent: [ 'test' ].
+
        ^JdmConnectionSpec new
                initialize;
-               user: 'root'; password: 'root';
-               host: 'localhost'; database: 'test';
-               port: 3306; yourself!
+               user: user;
+               password: password;
+               host: 'localhost';
+               database: db;
+               port: 3306;
+               yourself!
 
 createTable
        ^self createTableNamed: self class tableName!


--- orig/packages/sunit/SUnitScript.st
+++ mod/packages/sunit/SUnitScript.st
@@ -7,8 +7,8 @@
  ======================================================================"
 
 Object subclass: #TestSuitesScripter
-    instanceVariableNames: 'script stream'
-    classVariableNames: ''
+    instanceVariableNames: 'script stream variables'
+    classVariableNames: 'Current'
     poolDictionaries: ''
     category: 'SUnit'
 !
@@ -16,18 +16,20 @@ Object subclass: #TestSuitesScripter
 !TestSuitesScripter class methodsFor: 'Init / Release'!
 
 run: script quiet: quiet verbose: verbose
-    | suite result |
-    suite := TestSuitesScripter run: script.
+    | result |
+    result := self withScript: script do: [ :scripter |
+        | suite |
+        suite := scripter value.
+
+        "Set log policy to write to stdout."
+        quiet
+            ifTrue: [ suite logPolicy: TestLogPolicy null ].
+        verbose
+            ifTrue: [ suite logPolicy: (TestVerboseLog on: stdout) ].
+        (quiet or: [ verbose ])
+            ifFalse: [ suite logPolicy: (TestCondensedLog on: stdout) ].
 
-    "Set log policy to write to stdout."
-    quiet
-        ifTrue: [ suite logPolicy: TestLogPolicy null ].
-    verbose
-        ifTrue: [ suite logPolicy: (TestVerboseLog on: stdout) ].
-    (quiet or: [ verbose ])
-        ifFalse: [ suite logPolicy: (TestCondensedLog on: stdout) ].
-
-    result := suite run.
+        suite run ].
 
     "Print result depending on verboseness."
     quiet ifFalse: [
@@ -48,8 +50,25 @@ run: script quiet: quiet verbose: verbos
     ^result
 !
 
+current
+    ^Current
+!
+
+variableAt: aString ifAbsent: aBlock
+    self current isNil ifTrue: [ ^aBlock value ].
+aString printNl
+    ^(self current variableAt: aString ifAbsent: aBlock) printNl
+!
+
 run: aString
-    ^(self script: aString) value!
+    ^self withScript: aString do: [ :scripter |
+        scripter value run ]!
+
+withScript: aString do: aBlock
+    | previous |
+    previous := Current.
+    ^[ aBlock value: (Current := self script: aString) ]
+       sunitEnsure: [ Current := previous ]!
 
 script: aString
     ^self new setScript: aString! !
@@ -64,7 +83,7 @@ printOn: aStream
 
 !TestSuitesScripter methodsFor: 'Private'!
 
-executeSingleSuiteScript: aString 
+singleSuiteScript: aString 
     | useHierarchy realName testCase |
     aString last = $*
        ifTrue: 
@@ -81,11 +100,57 @@ executeSingleSuiteScript: aString 
        ifFalse: [testCase suite]
 !
 
+variableAt: aString put: valueString
+    ^variables at: aString put: valueString
+!
+
+variableAt: aString ifAbsent: aBlock
+    ^variables at: aString ifAbsent: aBlock
+!
+
+parseVariable: name
+    | value ch |
+    name isEmpty ifTrue: [ self error: 'empty variable name' ].
+    (stream peekFor: $') ifFalse: [
+        value := stream peek isSeparator 
+           ifTrue: [ '' ]
+           ifFalse: [ (self getNextWord: '') ifNil: [ '' ] ].
+       ^self variableAt: name put: value ].
+
+    value := WriteStream on: String new.
+    [
+        stream atEnd ifTrue: [ self error: 'unterminated string' ].
+       (ch := stream next) ~= $' or: [ stream peekFor: $' ]
+    ] whileTrue: [ value nextPut: ch ].
+
+    ^self variableAt: name put: value contents!
+
 getNextToken
-    [stream atEnd not and: [stream peek first = $"]] whileTrue: [self 
skipComment].
-    ^stream atEnd not
-       ifTrue: [stream next]
-       ifFalse: [nil]
+    | word |
+    [
+       self skipWhitespace.
+        word := self getNextWord: '='.
+        stream peekFor: $=
+    ] whileTrue: [ self parseVariable: word ].
+    ^word!
+
+skipWhitespace
+    [
+       self skipComments.
+        stream atEnd ifTrue: [ ^nil ].
+       stream peek isSeparator ] whileTrue: [ stream next ]!
+
+getNextWord: extraDelimiters
+    | word ch |
+    stream atEnd ifTrue: [ ^nil ].
+    word := WriteStream on: String new.
+    [
+       ch := stream peek.
+       ch isSeparator ifTrue: [ ^word contents ].
+       (extraDelimiters includes: ch) ifTrue: [ ^word contents ].
+       word nextPut: stream next.
+       stream atEnd ifTrue: [ ^word contents ].
+    ] repeat.
 !
 
 hierarchyOfTestSuitesFrom: aTestCase 
@@ -99,17 +164,11 @@ hierarchyOfTestSuitesFrom: aTestCase 
 !
 
 setScript: aString
+    variables := Dictionary new.
     script := aString!
 
-skipComment
-    | token inComment |
-    token := stream next.
-    token size > 1 & (token last = $") ifTrue: [^nil].
-    inComment := true.
-    [inComment & stream atEnd not]
-       whileTrue: 
-           [token := stream next.
-           token last = $" ifTrue: [inComment := false]]
+skipComments
+    [ stream peekFor: $" ] whileTrue: [ stream skipTo: $" ].
 ! !
 
 !TestSuitesScripter methodsFor: 'Scripting'!
@@ -117,11 +176,11 @@ skipComment
 value
     | suite subSuite token |
     suite := TestSuite new.
-    stream := ReadStream on: script sunitSubStrings. 
+    stream := ReadStream on: script. 
     [stream atEnd] whileFalse: 
        [token := self getNextToken.
        token notNil ifTrue: [
-           subSuite := self executeSingleSuiteScript: token.
-           subSuite notNil ifTrue:[suite addTest: subSuite]]].
+           subSuite := self singleSuiteScript: token.
+           subSuite notNil ifTrue: [suite addTest: subSuite]]].
     ^suite! !
 


--- orig/packages/sunit/SUnitScriptTests.st
+++ mod/packages/sunit/SUnitScriptTests.st
@@ -43,9 +43,15 @@ TestCase subclass: #TestSuitesScriptTest
 
 !TestSuitesScriptTest methodsFor: 'Testing'!
 
+suiteFor: aScript
+    ^(TestSuitesScripter script: aScript) value!
+
+compile: aScript
+    ^(TestSuitesScripter script: aScript) value; yourself!
+
 testCompoundScript
     | allTestCaseClasses superCase subCase |
-    allTestCaseClasses := (TestSuitesScripter run: 
'TestSuitesHierarchyScriptTest TestSuitesCompoundScriptTest') tests. 
+    allTestCaseClasses := (self suiteFor: 'TestSuitesHierarchyScriptTest 
TestSuitesCompoundScriptTest') tests. 
     self assert: allTestCaseClasses size = 2.
     superCase := (allTestCaseClasses at: 1) tests first.
     self assert: superCase class sunitName sunitAsSymbol = 
#TestSuitesHierarchyScriptTest.
@@ -55,31 +61,31 @@ testCompoundScript
 
 testEmbeddedNameCommentScript
     | suite |
-    suite := TestSuitesScripter run: ' "This comment contains the name of a 
SUnitTest Case"  TestSuitesScriptTest'.
+    suite := self suiteFor: ' "This comment contains the name of a SUnitTest 
Case"  TestSuitesScriptTest'.
     self assert: suite tests size = 1
 !
 
 testEmptyCommentScript
     | suite |
-    suite := TestSuitesScripter run: ' " " TestSuitesScriptTest'.
+    suite := self suiteFor: ' " " TestSuitesScriptTest'.
     self assert: suite tests size = 1
 !
 
 testEmptyHierarchyScript
     | suite |
-    suite := TestSuitesScripter run: '*'.
+    suite := self suiteFor: '*'.
     self assert: suite tests isEmpty
 !
 
 testEmptyScript
     | suite |
-    suite := TestSuitesScripter run: ''.
+    suite := self suiteFor: ''.
     self assert: suite tests isEmpty
 !
 
 testHierarchyScript
     | allTestCaseClasses superCase subCase suite |
-    suite := TestSuitesScripter run: 'TestSuitesHierarchyScriptTest*'.
+    suite := self suiteFor: 'TestSuitesHierarchyScriptTest*'.
     allTestCaseClasses := suite tests. 
     self assert: allTestCaseClasses size = 1.
     superCase := (allTestCaseClasses first tests at: 1) tests first.
@@ -90,13 +96,13 @@ testHierarchyScript
 
 testOpenCommentScript
     | suite |
-    suite := TestSuitesScripter run: ' "SUnitTest'.
+    suite := self suiteFor: ' "SUnitTest'.
     self assert: suite tests isEmpty
 !
 
 testSimpleScript
     | allTestCaseClasses case suite |
-    suite := TestSuitesScripter run: 'TestSuitesHierarchyScriptTest'.
+    suite := self suiteFor: 'TestSuitesHierarchyScriptTest'.
     allTestCaseClasses := suite tests.
     self assert: allTestCaseClasses size = 1.
     case := (allTestCaseClasses at: 1) tests at: 1.
@@ -105,13 +111,42 @@ testSimpleScript
 
 testSingleWordCommentScript
     | suite |
-    suite := TestSuitesScripter run: ' "SUnitTest" TestSuitesScriptTest'.
+    suite := self suiteFor: ' "SUnitTest" TestSuitesScriptTest'.
     self assert: suite tests size = 1
 !
 
 testTwoCommentsScript
     | suite |
-    suite := TestSuitesScripter run: ' " SUnitTest "  " SUnitTest " 
TestSuitesScriptTest'.
+    suite := self suiteFor: ' " SUnitTest "  " SUnitTest " 
TestSuitesScriptTest'.
+    self assert: suite tests size = 1.
+    suite := self suiteFor: ' " SUnitTest "" SUnitTest " TestSuitesScriptTest'.
     self assert: suite tests size = 1
+!
+
+testStringVariableScript
+    | scripter |
+    scripter := self compile: 'var1=''value'' var2=''''''quoted "not SUnitTest 
and not a comment"
+'''''' TestSuitesScriptTest'.
+    self assert: (scripter variableAt: 'var1' ifAbsent: [ 42 ]) = 'value'.
+    self assert: (scripter variableAt: 'var2' ifAbsent: [ 42 ]) = '''quoted 
"not SUnitTest and not a comment"
+'''.
+    self assert: (scripter variableAt: 'var3' ifAbsent: [ 42 ]) = 42.
+    self assert: scripter value tests size = 1
+!
+
+testVariableScript
+    | scripter |
+    scripter := self compile: ' var1=value TestSuitesScriptTest'.
+    self assert: (scripter variableAt: 'var1' ifAbsent: [ 42 ]) = 'value'.
+    self assert: (scripter variableAt: 'var2' ifAbsent: [ 42 ]) = 42.
+    self assert: scripter value tests size = 1
+!
+
+testEmptyVariableScript
+    | scripter |
+    scripter := self compile: ' var1= TestSuitesScriptTest'.
+    self assert: (scripter variableAt: 'var1' ifAbsent: [ 42 ]) = ''.
+    self assert: (scripter variableAt: 'var2' ifAbsent: [ 42 ]) = 42.
+    self assert: scripter value tests size = 1
 ! !
 


--- orig/tests/atlocal.in
+++ mod/tests/atlocal.in
@@ -1 +1,9 @@
address@hidden@
+enable_mysql_tests='@enable_mysql_tests@'
+mysqlvars=`echo $enable_mysql_tests | awk '
+  BEGIN { FS=":" }
+  /^(yes|no)$/ { next }
+  length($1) { printf "mysqluser='\''%s'\'' ", $1 }
+  length($2) { printf "mysqlpassword='\''%s'\'' ", $2 }
+  length($3) { printf "mysqldb='\''%s'\'' ", $3 }
+' `
+


--- orig/tests/local.at
+++ mod/tests/local.at
@@ -40,26 +40,26 @@ m4_define([AT_DIFF_TEST], [
   AT_CLEANUP
 ])
 
-dnl AT_PACKAGE_TEST([PACKAGE], [XFAILS], [CLASSES], [CONDITION])
-dnl ------------------------------------------------------------
+dnl AT_PACKAGE_TEST([PACKAGE], [XFAILS], [VARS], [CONDITION])
+dnl ---------------------------------------------------------
 m4_define([AT_PACKAGE_TEST], [
   AT_SETUP([$1])
   AT_KEYWORDS([m4_if([$1], [SUnit], [], [$1 ])SUnit])
   $2
   m4_ifval([$4], [AT_CHECK([$4 || exit 77])])
-  AT_CHECK_GST([-f $abs_top_srcdir/scripts/Test.st --verbose -p $1 $3], [], 
[], [ignore])
+  AT_CHECK_GST([-f $abs_top_srcdir/scripts/Test.st --verbose $3 -p $1], [], 
[], [ignore])
   AT_CLEANUP
 ])
 
-dnl AT_OPTIONAL_PACKAGE_TEST([PACKAGE], [XFAILS], [CLASSES], [CONDITION])
-dnl ---------------------------------------------------------------------
+dnl AT_OPTIONAL_PACKAGE_TEST([PACKAGE], [XFAILS], [VARS], [CONDITION])
+dnl ------------------------------------------------------------------
 dnl Returns exit code 77 (skip) if the package cannot be loaded.
 m4_define([AT_OPTIONAL_PACKAGE_TEST], [
   AT_SETUP([$1])
   AT_KEYWORDS([$1 SUnit])
   $2
   m4_ifval([$4], [AT_CHECK([$4 || exit 77])])
-  AT_CHECK_GST([-f $abs_top_srcdir/scripts/Test.st --verbose -p $1 $3
+  AT_CHECK_GST([-f $abs_top_srcdir/scripts/Test.st --verbose $3 -p $1
     ret=$?
     case $ret in
       2) exit 77 ;;


--- orig/tests/testsuite
+++ mod/tests/testsuite
@@ -4083,14 +4083,14 @@ _ATEOF
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p SUnit ); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p SUnit); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:71: { (cd \$abs_top_builddir && gst \$image_path 
-f \$abs_top_srcdir/scripts/Test.st --verbose -p SUnit ); echo exit \$? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:71: { (cd \$abs_top_builddir && gst \$image_path 
-f \$abs_top_srcdir/scripts/Test.st --verbose  -p SUnit); echo exit \$? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:71 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p SUnit ); echo exit $? > retcode; } 
| tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p SUnit); echo exit $? > retcode; } 
| tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -4098,12 +4098,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p SUnit ); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p SUnit); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p SUnit ); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p SUnit); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -4151,14 +4151,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Parser ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Parser); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:72: { (cd \$abs_top_builddir && gst \$image_path 
-f \$abs_top_srcdir/scripts/Test.st --verbose -p Parser ); echo exit \$? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:72: { (cd \$abs_top_builddir && gst \$image_path 
-f \$abs_top_srcdir/scripts/Test.st --verbose  -p Parser); echo exit \$? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:72 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Parser ); echo exit $? > retcode; 
} | tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Parser); echo exit $? > retcode; 
} | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -4166,12 +4166,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Parser ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Parser); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Parser ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Parser); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -8592,14 +8592,14 @@ _ATEOF
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Complex ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Complex); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:142: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Complex ); echo 
exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:142: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p Complex); echo 
exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:142 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Complex ); echo exit $? > retcode; 
} | tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Complex); echo exit $? > retcode; 
} | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -8607,12 +8607,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Complex ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Complex); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Complex ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Complex); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -8660,14 +8660,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Continuations ); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Continuations); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:143: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Continuations ); 
echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:143: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p Continuations); 
echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:143 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Continuations ); echo exit $? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Continuations); echo exit $? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -8675,12 +8675,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Continuations ); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Continuations); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Continuations ); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Continuations); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -8728,14 +8728,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DebugTools ); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DebugTools); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:144: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p DebugTools ); 
echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:144: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p DebugTools); 
echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:144 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DebugTools ); echo exit $? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DebugTools); echo exit $? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -8743,12 +8743,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DebugTools ); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DebugTools); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DebugTools ); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DebugTools); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -8796,14 +8796,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DhbNumericalMethods ); echo exit 
$? > retcode; } | tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DhbNumericalMethods); echo exit 
$? > retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:145: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p 
DhbNumericalMethods ); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . 
retcode"
+echo "$at_srcdir/testsuite.at:145: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p 
DhbNumericalMethods); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . 
retcode"
 echo testsuite.at:145 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DhbNumericalMethods ); echo exit 
$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DhbNumericalMethods); echo exit 
$? > retcode; } | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -8811,12 +8811,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DhbNumericalMethods ); echo exit 
$? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 
2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DhbNumericalMethods); echo exit 
$? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 
2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p DhbNumericalMethods ); echo exit 
$? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 
2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p DhbNumericalMethods); echo exit 
$? > retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 
2>"$at_stderr"
     at_status=$?
 fi
 
@@ -8864,14 +8864,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Digest ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Digest); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:146: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Digest ); echo 
exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:146: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p Digest); echo 
exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:146 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Digest ); echo exit $? > retcode; 
} | tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Digest); echo exit $? > retcode; 
} | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -8879,12 +8879,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Digest ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Digest); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Digest ); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Digest); echo exit $? > retcode; 
} | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -8932,14 +8932,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p GDBM
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p GDBM
     ret=$?
     case $ret in
       2) exit 77 ;;
       0|1) exit $ret ;;
     esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:147: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p GDBM
+echo "$at_srcdir/testsuite.at:147: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p GDBM
     ret=\$?
     case \$ret in
       2) exit 77 ;;
@@ -8953,7 +8953,7 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p GDBM
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p GDBM
     ret=$?
     case $ret in
       2) exit 77 ;;
@@ -8963,7 +8963,7 @@ if test -n "$at_trace_this"; then
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p GDBM
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p GDBM
     ret=$?
     case $ret in
       2) exit 77 ;;
@@ -9016,14 +9016,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Iconv
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Iconv
     ret=$?
     case $ret in
       2) exit 77 ;;
       0|1) exit $ret ;;
     esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:148: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p Iconv
+echo "$at_srcdir/testsuite.at:148: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p Iconv
     ret=\$?
     case \$ret in
       2) exit 77 ;;
@@ -9037,7 +9037,7 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Iconv
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Iconv
     ret=$?
     case $ret in
       2) exit 77 ;;
@@ -9047,7 +9047,7 @@ if test -n "$at_trace_this"; then
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p Iconv
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p Iconv
     ret=$?
     case $ret in
       2) exit 77 ;;
@@ -9094,12 +9094,12 @@ $at_traceon
 
 
   $at_traceoff
-echo "$at_srcdir/testsuite.at:149: test \"\$enable_mysql_tests\" = yes || exit 
77"
+echo "$at_srcdir/testsuite.at:149: test \"\$enable_mysql_tests\" != no || exit 
77"
 echo testsuite.at:149 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "test \"$enable_mysql_tests\" = yes || exit 77" in
+    case "test \"$enable_mysql_tests\" != no || exit 77" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -9107,12 +9107,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; test "$enable_mysql_tests" = yes || exit 77 ) >"$at_stdout" 
2>"$at_stder1"
+    ( $at_traceon; test "$enable_mysql_tests" != no || exit 77 ) >"$at_stdout" 
2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; test "$enable_mysql_tests" = yes || exit 77 ) >"$at_stdout" 
2>"$at_stderr"
+    ( :; test "$enable_mysql_tests" != no || exit 77 ) >"$at_stdout" 
2>"$at_stderr"
     at_status=$?
 fi
 
@@ -9140,14 +9140,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p MySQL ); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode"
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose $mysqlvars -p MySQL); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:149: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p MySQL ); echo 
exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
+echo "$at_srcdir/testsuite.at:149: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose \$mysqlvars -p 
MySQL); echo exit \$? > retcode; } | tr -d '\\r' | tee stdout; . retcode"
 echo testsuite.at:149 >"$at_check_line_file"
 
 at_trace_this=
 if test -n "$at_traceon"; then
-    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p MySQL ); echo exit $? > retcode; } 
| tr -d '\\r' | tee stdout; . retcode" in
+    case "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose $mysqlvars -p MySQL); echo exit $? > 
retcode; } | tr -d '\\r' | tee stdout; . retcode" in
         *'
 '*) echo 'Not enabling shell tracing (command contains an embedded newline)' ;;
  *) at_trace_this=yes ;;
@@ -9155,12 +9155,12 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p MySQL ); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose $mysqlvars -p MySQL); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stder1"
     at_status=$?
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p MySQL ); echo exit $? > retcode; } 
| tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose $mysqlvars -p MySQL); echo exit $? > 
retcode; } | tr -d '\r' | tee stdout; . retcode ) >"$at_stdout" 2>"$at_stderr"
     at_status=$?
 fi
 
@@ -9208,14 +9208,14 @@ $at_traceon
     *) image_path="" ;;
   esac
 
-  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p ZLib
+  echo "{ (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p ZLib
     ret=$?
     case $ret in
       2) exit 77 ;;
       0|1) exit $ret ;;
     esac); echo exit $? > retcode; } | tr -d '\r' | tee stdout; . retcode"
   $at_traceoff
-echo "$at_srcdir/testsuite.at:150: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose -p ZLib
+echo "$at_srcdir/testsuite.at:150: { (cd \$abs_top_builddir && gst 
\$image_path -f \$abs_top_srcdir/scripts/Test.st --verbose  -p ZLib
     ret=\$?
     case \$ret in
       2) exit 77 ;;
@@ -9229,7 +9229,7 @@ if test -n "$at_traceon"; then
 fi
 
 if test -n "$at_trace_this"; then
-    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p ZLib
+    ( $at_traceon; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p ZLib
     ret=$?
     case $ret in
       2) exit 77 ;;
@@ -9239,7 +9239,7 @@ if test -n "$at_trace_this"; then
     grep '^ *+' "$at_stder1" >&2
     grep -v '^ *+' "$at_stder1" >"$at_stderr"
 else
-    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose -p ZLib
+    ( :; { (cd $abs_top_builddir && gst $image_path -f 
$abs_top_srcdir/scripts/Test.st --verbose  -p ZLib
     ret=$?
     case $ret in
       2) exit 77 ;;


--- orig/tests/testsuite.at
+++ mod/tests/testsuite.at
@@ -146,5 +146,5 @@ AT_PACKAGE_TEST([DhbNumericalMethods])
 AT_PACKAGE_TEST([Digest])
 AT_OPTIONAL_PACKAGE_TEST([GDBM])
 AT_OPTIONAL_PACKAGE_TEST([Iconv])
-AT_PACKAGE_TEST([MySQL], [], [], [test "$enable_mysql_tests" = yes])
+AT_PACKAGE_TEST([MySQL], [], [$mysqlvars], [test "$enable_mysql_tests" != no])
 AT_OPTIONAL_PACKAGE_TEST([ZLib])