From 3d7019054d19911afb28fc7e86f999c4ec3cd5c6 Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Thu, 15 Nov 2018 14:16:10 +0000
Subject: [PATCH] Trying to fix the linux builds. Re #23920
---
buildconfig/CMake/Packaging/mantidpython.in | 1 +
qt/python/mantidqt/utils/qt/test/run_test_app.py | 6 +-----
qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/buildconfig/CMake/Packaging/mantidpython.in b/buildconfig/CMake/Packaging/mantidpython.in
index c96304ffa46..b7257f96d5c 100755
--- a/buildconfig/CMake/Packaging/mantidpython.in
+++ b/buildconfig/CMake/Packaging/mantidpython.in
@@ -46,6 +46,7 @@ fi
LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} \
TCMALLOC_LARGE_ALLOC_REPORT_THRESHOLD=${TCM_REPORT} \
+ @MTD_PATH_DEFINITION@ \
PYTHONPATH=${LOCAL_PYTHONPATH} \
QT_API=${LOCAL_QT_API} \
LD_LIBRARY_PATH=${LOCAL_LDPATH} \
diff --git a/qt/python/mantidqt/utils/qt/test/run_test_app.py b/qt/python/mantidqt/utils/qt/test/run_test_app.py
index 0264bc9444c..5ffa78a80a6 100644
--- a/qt/python/mantidqt/utils/qt/test/run_test_app.py
+++ b/qt/python/mantidqt/utils/qt/test/run_test_app.py
@@ -79,8 +79,6 @@ class ScriptRunner(object):
if self.script_iter is None:
if self.close_on_finish:
self.widget.close()
- app.quit()
- app = None
return
# Run test script until the next 'yield'
pause_sec = self.script_iter.next()
@@ -97,8 +95,6 @@ class ScriptRunner(object):
self.parent_iter = None
elif self.close_on_finish:
self.widget.close()
- app.quit()
- app = None
except:
self.widget.close()
traceback.print_exc()
@@ -123,8 +119,8 @@ def open_in_window(widget_name, script, attach_debugger=True, pause=0, close_on_
global app
if attach_debugger:
raw_input('Please attach the Debugger now if required. Press any key to continue')
- setup_library_paths()
if app is None:
+ setup_library_paths()
app = QApplication([""])
if isinstance(widget_name, six.string_types):
w = create_widget(widget_name)
diff --git a/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py b/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
index 2c8ef159193..b092147beda 100644
--- a/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
+++ b/qt/python/mantidqt/widgets/test/test_fitpropertybrowser.py
@@ -4,6 +4,7 @@ import unittest
from qtpy.QtWidgets import QMessageBox, QApplication
from qtpy.QtCore import Qt, QMetaObject
+from mantid import FrameworkManager
from mantidqt.utils.qt.test.test_window import GuiTestBase
from mantidqt.widgets.fitpropertybrowser import FitPropertyBrowser
--
GitLab