Changeset: 2720cde908c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2720cde908c9
Modified Files:
sql/backends/monet5/Tests/shutdown.py
tools/mserver/shutdowntest.c
Branch: default
Log Message:
Pass a --pipeline option to shutdowntest in pipeline testing.
diffs (41 lines):
diff --git a/sql/backends/monet5/Tests/shutdown.py
b/sql/backends/monet5/Tests/shutdown.py
--- a/sql/backends/monet5/Tests/shutdown.py
+++ b/sql/backends/monet5/Tests/shutdown.py
@@ -3,14 +3,13 @@ import os
import shutil
databasedir = os.getenv('TSTTRGDIR')
-if databasedir == None:
- exit()
+if databasedir is None:
+ exit("TSTTRGDIR needs to be in the environment")
databasedir = os.path.join(databasedir, 'SHUTDOWN_DATABASE')
try:
- if os.name == 'nt':
- os.system('shutdowntest.exe "%s"' % databasedir)
- else:
- os.system('shutdowntest "%s"' % databasedir)
+ os.system(f"shutdowntest{'.exe' if os.name == 'nt' else ''}"
+ f" {'--pipeline' if os.getenv('PIPELINE') else ''}"
+ f" {databasedir}")
finally:
shutil.rmtree(databasedir)
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -310,8 +310,13 @@ int main(int argc, char **argv) {
str retval;
Client c;
int i = 0;
+ if (argc > 1 && strcmp(argv[1], "--pipeline") == 0) {
+ default_pipeline_mode = true;
+ argc--;
+ argv++;
+ }
if (argc <= 1) {
- printf("Usage: shutdowntest [testdir]\n");
+ printf("Usage: shutdowntest [--pipeline] testdir\n");
return -1;
}
dbdir = argv[1];
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
