Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions gui/fitpanel/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,15 @@
# @author Danilo Piparo CERN

ROOT_EXECUTABLE(fitPanelUnitTesting UnitTesting.cxx LIBRARIES FitPanel Gui Tree Hist MathCore)
ROOT_ADD_TEST(test-fitpanel-UnitTesting COMMAND fitPanelUnitTesting -b FAILREGEX "FAILED|Error in")
target_include_directories(fitPanelUnitTesting PRIVATE ../src/)

# batch usage is instable - need more investigations
#ROOT_ADD_TEST(test-fitpanel-UnitTesting-batch COMMAND fitPanelUnitTesting -b FAILREGEX "FAILED|Error in")

find_program(XVFB_RUN_EXECUTABLE NAMES xvfb-run)

if(XVFB_RUN_EXECUTABLE)
ROOT_ADD_TEST(test-fitpanel-UnitTesting-xvfb
COMMAND ${XVFB_RUN_EXECUTABLE} --auto-servernum --server-args="-screen 0 1024x768x24" ./fitPanelUnitTesting
PASSRC 1
FAILREGEX "FAILED|Error in")
endif()
12 changes: 8 additions & 4 deletions gui/fitpanel/test/UnitTesting.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <cmath>
#include <cstdio>

#include "CommonDefs.h"
#include "../src/CommonDefs.h"

#ifdef WIN32
#include "io.h"
Expand Down Expand Up @@ -217,11 +217,15 @@ class FitEditorUnitTesting

result += MakeTest("TestUpdateTree.....", &FitEditorUnitTesting::TestUpdateTree);

// result += MakeTest("TestTree1D.........", &FitEditorUnitTesting::TestTree1D); // TODO reenable once stack smashing issue is fixed
// TODO: reenable in batch once stack smashing issue is fixed
Comment thread
linev marked this conversation as resolved.
if (!gROOT->IsBatch())
result += MakeTest("TestTree1D.........", &FitEditorUnitTesting::TestTree1D);

// result += MakeTest("TestTree2D.........", &FitEditorUnitTesting::TestTree2D); // TODO reenable once fit results are fixed
// TODO: reenable once fit results are fixed
// result += MakeTest("TestTree2D.........", &FitEditorUnitTesting::TestTree2D);
Comment thread
linev marked this conversation as resolved.

// result += MakeTest("TestTreeND.........", &FitEditorUnitTesting::TestTreeND); // TODO reenable once fit results are fixed
// TODO: reenable once fit results are fixed
// result += MakeTest("TestTreeND.........", &FitEditorUnitTesting::TestTreeND);
Comment thread
linev marked this conversation as resolved.

fprintf(out, "\nRemember to also check outputUnitTesting.txt for "
"more detailed information\n\n");
Expand Down
Loading