diff --git a/browser/Makefile.am b/browser/Makefile.am index ffa7b15a2..562e00075 100644 --- a/browser/Makefile.am +++ b/browser/Makefile.am @@ -798,8 +798,6 @@ check-local: $(MOCHA_TS_JS_FILES) exit 1; \ fi -SSL_FLAG = `xmllint --xpath 'string(/config/ssl/enable)' $(abs_top_builddir)/coolwsd.xml` - # the delay (in milliseconds) between each emulated key stroke for each view typing_speed=100 # The duration of the typing (in milliseconds) @@ -818,6 +816,6 @@ perf-test: echo 'Making fresh copy of the perf-test-edit.odt document'; \ cp $(abs_top_srcdir)/test/data/perf-test.odt $(abs_top_builddir)/test/data/perf-test-edit.odt; \ fi - $(NODE) $(abs_srcdir)/test/bootstrap.js $(SSL_FLAG) $(abs_top_builddir) $(abs_srcdir) $(typing_speed) $(single_view) $(typing_duration) $(node_inspect) ${record_stats} + $(NODE) $(abs_srcdir)/test/bootstrap.js $(abs_top_builddir) $(abs_srcdir) $(typing_speed) $(single_view) $(typing_duration) $(node_inspect) ${record_stats} # for now - unwinding ts and js deps for different targets is a real pain. .NOTPARALLEL: diff --git a/browser/test/bootstrap.js b/browser/test/bootstrap.js index 600b4c177..415eb5dc7 100644 --- a/browser/test/bootstrap.js +++ b/browser/test/bootstrap.js @@ -2,18 +2,21 @@ const https = require("https"); const http = require("http"); const { spawn, fork } = require('child_process'); -if (process.argv.length < 5 || process.argv[2] == '--help') { - console.debug('bootstrap.js '); +if (process.argv.length < 4 || process.argv[2] == '--help') { + console.debug('bootstrap.js '); process.exit(0); } -const ssl_flag = process.argv[2]; -const top_builddir = process.argv[3]; -const srcdir = process.argv[4]; -const typing_speed = process.argv[5]; -const single_view = process.argv[6]; -const typing_duration = process.argv[7]; -const inspect = process.argv[8]; -const recordStats = process.argv[9]; + +// Websocket can't cope with SSL certificates. +const ssl_flag = false; + +const top_builddir = process.argv[2]; +const srcdir = process.argv[3]; +const typing_speed = process.argv[4]; +const single_view = process.argv[5]; +const typing_duration = process.argv[6]; +const inspect = process.argv[7]; +const recordStats = process.argv[8]; // verbose console output const debug = false;