Skip to content
Snippets Groups Projects
Commit 69bb4799 authored by Roman Tolchenov's avatar Roman Tolchenov
Browse files

Trying to fix the linux builds. Re #23920

parent 4efc09f2
No related branches found
No related tags found
No related merge requests found
......@@ -9,8 +9,6 @@ THISFILE=$(readlink -f "$0")
INSTALLDIR=$(dirname $THISFILE) # directory of executable
INSTALLDIR=$(dirname $INSTALLDIR) # root install directory
@MTD_PATH_DEFINITION@
@TCMALLOC_DEFINITIONS@
LOCAL_LDPATH=@EXTRA_LDPATH@
......@@ -41,6 +39,7 @@ fi
LD_PRELOAD=${LOCAL_PRELOAD} TCMALLOC_RELEASE_RATE=${TCM_RELEASE} \
TCMALLOC_LARGE_ALLOC_REPORT_THRESHOLD=${TCM_REPORT} \
@MTD_PATH_DEFINITION@ \
PYTHONPATH=${LOCAL_PYTHONPATH} \
LD_LIBRARY_PATH=${LOCAL_LDPATH} \
PV_PLUGIN_PATH=${PV_PLUGIN_PATH} \
......
......@@ -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)
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment