From 968cf3d558fbdb9b3740bc952b68137f22528f66 Mon Sep 17 00:00:00 2001 From: abn Date: Tue, 12 Apr 2016 13:38:41 +0200 Subject: [PATCH] [MEDCalc] Moved test directory up one level --- src/MEDCalc/CMakeLists.txt | 5 +++++ src/MEDCalc/gui/CMakeLists.txt | 2 -- src/MEDCalc/{gui => }/test/CMakeLists.txt | 0 src/MEDCalc/{gui => }/test/README.txt | 0 .../{gui => }/test/baselines/test_scalarmap.png | Bin src/MEDCalc/{gui => }/test/guiTester.pro | 0 src/MEDCalc/{gui => }/test/medcalc_testutils.py.in | 0 .../{gui => }/test/scenarios/test_scalarmap.xml | 0 src/MEDCalc/{gui => }/test/test_qttesting.py | 0 src/MEDCalc/{gui => }/test/test_scalarmap.py | 0 10 files changed, 5 insertions(+), 2 deletions(-) rename src/MEDCalc/{gui => }/test/CMakeLists.txt (100%) rename src/MEDCalc/{gui => }/test/README.txt (100%) rename src/MEDCalc/{gui => }/test/baselines/test_scalarmap.png (100%) rename src/MEDCalc/{gui => }/test/guiTester.pro (100%) rename src/MEDCalc/{gui => }/test/medcalc_testutils.py.in (100%) rename src/MEDCalc/{gui => }/test/scenarios/test_scalarmap.xml (100%) rename src/MEDCalc/{gui => }/test/test_qttesting.py (100%) rename src/MEDCalc/{gui => }/test/test_scalarmap.py (100%) diff --git a/src/MEDCalc/CMakeLists.txt b/src/MEDCalc/CMakeLists.txt index a0815a29f..d6a1e4d3a 100644 --- a/src/MEDCalc/CMakeLists.txt +++ b/src/MEDCalc/CMakeLists.txt @@ -22,6 +22,11 @@ ADD_SUBDIRECTORY(res) IF(SALOME_BUILD_GUI) ADD_SUBDIRECTORY(gui) + + IF(SALOME_MED_WITH_QTTESTING) + ADD_SUBDIRECTORY(test) + ENDIF() + ENDIF() IF(SALOME_MED_ENABLE_PYTHON) diff --git a/src/MEDCalc/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt index f53d45075..b33ab4dfc 100644 --- a/src/MEDCalc/gui/CMakeLists.txt +++ b/src/MEDCalc/gui/CMakeLists.txt @@ -17,8 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(test) - IF(SALOME_MED_WITH_QTTESTING) ADD_DEFINITIONS(-DMED_HAS_QTTESTING) ENDIF() diff --git a/src/MEDCalc/gui/test/CMakeLists.txt b/src/MEDCalc/test/CMakeLists.txt similarity index 100% rename from src/MEDCalc/gui/test/CMakeLists.txt rename to src/MEDCalc/test/CMakeLists.txt diff --git a/src/MEDCalc/gui/test/README.txt b/src/MEDCalc/test/README.txt similarity index 100% rename from src/MEDCalc/gui/test/README.txt rename to src/MEDCalc/test/README.txt diff --git a/src/MEDCalc/gui/test/baselines/test_scalarmap.png b/src/MEDCalc/test/baselines/test_scalarmap.png similarity index 100% rename from src/MEDCalc/gui/test/baselines/test_scalarmap.png rename to src/MEDCalc/test/baselines/test_scalarmap.png diff --git a/src/MEDCalc/gui/test/guiTester.pro b/src/MEDCalc/test/guiTester.pro similarity index 100% rename from src/MEDCalc/gui/test/guiTester.pro rename to src/MEDCalc/test/guiTester.pro diff --git a/src/MEDCalc/gui/test/medcalc_testutils.py.in b/src/MEDCalc/test/medcalc_testutils.py.in similarity index 100% rename from src/MEDCalc/gui/test/medcalc_testutils.py.in rename to src/MEDCalc/test/medcalc_testutils.py.in diff --git a/src/MEDCalc/gui/test/scenarios/test_scalarmap.xml b/src/MEDCalc/test/scenarios/test_scalarmap.xml similarity index 100% rename from src/MEDCalc/gui/test/scenarios/test_scalarmap.xml rename to src/MEDCalc/test/scenarios/test_scalarmap.xml diff --git a/src/MEDCalc/gui/test/test_qttesting.py b/src/MEDCalc/test/test_qttesting.py similarity index 100% rename from src/MEDCalc/gui/test/test_qttesting.py rename to src/MEDCalc/test/test_qttesting.py diff --git a/src/MEDCalc/gui/test/test_scalarmap.py b/src/MEDCalc/test/test_scalarmap.py similarity index 100% rename from src/MEDCalc/gui/test/test_scalarmap.py rename to src/MEDCalc/test/test_scalarmap.py -- 2.39.2