diff --git a/src/tests/xpra/perf_config_default.py b/src/tests/xpra/perf_config_default.py index 230d76021c..411c1bebe4 100644 --- a/src/tests/xpra/perf_config_default.py +++ b/src/tests/xpra/perf_config_default.py @@ -204,8 +204,9 @@ def screensaver(x): #VNC_JPEG_OPTIONS = [-1, 0, 8] VNC_JPEG_OPTIONS = [-1, 4] - def print_vars(self): - print("\nCurrent Settings:\n-----------------") + def print_options(self): + print("\nCurrent Settings:") + print("-"*80) print("CUSTOM_PARAMS: %s" % str(self.CUSTOM_PARAMS)) print("GLX_TESTS: %s" % self.GLX_TESTS) print("X11_TESTS: %s" % self.X11_TESTS) @@ -255,4 +256,4 @@ def print_vars(self): print("VNC_ZLIB_OPTIONS: %s" % self.VNC_ZLIB_OPTIONS) print("VNC_COMPRESSION_OPTIONS: %s" % self.VNC_COMPRESSION_OPTIONS) print("VNC_JPEG_OPTIONS: %s" % self.VNC_JPEG_OPTIONS) - print("-----------------") + print("-"*80) diff --git a/src/tests/xpra/test_measure_perf.py b/src/tests/xpra/test_measure_perf.py index e440c7da7b..c3b1b4f94c 100755 --- a/src/tests/xpra/test_measure_perf.py +++ b/src/tests/xpra/test_measure_perf.py @@ -40,6 +40,8 @@ def get_config(config_name): config = get_config(config_name) if (config==None): raise Exception("Could not load config file") +config.print_options() +sys.exit() if (len(sys.argv) > 2): csv_name = sys.argv[2] @@ -103,8 +105,6 @@ def get_config(config_name): if not os.path.exists(x): raise Exception("cannot run tests: %s is missing!" % x) -config.print_vars() - HEADERS = ["Test Name", "Remoting Tech", "Server Version", "Client Version", "Custom Params", "SVN Version", "Encoding", "Quality", "Speed","OpenGL", "Test Command", "Sample Duration (s)", "Sample Time (epoch)", "CPU info", "Platform", "Kernel Version", "Xorg version", "OpenGL", "Client Window Manager", "Screen Size",