Commit 856e80f2 authored by Andreas Freise's avatar Andreas Freise Committed by Daniel Brown

re-using --test now for brumsoftest

parent 95ec4e21
Pipeline #29599 failed with stage
in 9 minutes and 5 seconds
......@@ -466,19 +466,20 @@ int main(int argc, char *argv[]) {
--argc;
found = true;
}
#ifdef TEST
// process --test option (runs unit tests, NOT for user distro)
else if (strcasecmp(argv[1 + num_options], "--test") == 0) {
printf("\n##### Running tests #####\n");
RunAllTests();
printf("##### Finished tests #####\n");
//printf("\n##### Running tests #####\n");
// RunAllTests();
//printf("##### Finished tests #####\n");
// clean up nicely
fflush(stdout);
fflush(stderr);
exit(0);
//fflush(stdout);
//fflush(stderr);
//exit(0);
options.test = 1;
++num_options;
--argc;
found = true;
}
#endif
// process --new option (switch on new features)
else if (strcasecmp(argv[1 + num_options], "--new") == 0) {
......
......@@ -1978,6 +1978,7 @@ typedef struct options {
int portnumber; //!< portnumber for client server communication
int version; //!< print version and quit
int noheader; //!< do not print header into output file
int test; //!< for brumsofttest, do not call any plotting
bool use_coupling_reduction;
char out_format[MAX_TOKEN_LEN];
int nicslu_threads;
......
......@@ -4132,7 +4132,7 @@ void x12_out(void) {
fclose(pfp);
}
if (inter.num_gnuterm_cmds != NO_GNUTERM && !options.perl1 && !inter.noxaxis) {
if (inter.num_gnuterm_cmds != NO_GNUTERM && !options.test && !inter.noxaxis) {
#if defined(OSWIN) && !defined(__CYGWIN__)
wchar_t wargs[LINE_LEN] = {0};
......@@ -4310,7 +4310,7 @@ void x12_out(void) {
// creating python file and calling python!
if (inter.num_pyterm_cmds != NO_PYTERM && !options.perl1) {
if (inter.num_pyterm_cmds != NO_PYTERM && !options.test) {
#if defined(OSWIN) && !defined(__CYGWIN__)
wchar_t wargs[LINE_LEN] = {0};
......@@ -4493,7 +4493,8 @@ void x3_out(void) {
open_file_to_write_ascii(vglobal.gnuplot_fname, &gfp);
gnufile(i, gfp, vglobal.output_fname, false);
fclose(gfp);
}
if (inter.num_gnuterm_cmds != NO_GNUTERM && !options.test) {
system_call(command);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment