Merge branch 'feature/970_python_fitfunctions' into develop. Refs #970

Conflicts: Code/Mantid/Framework/PythonInterface/test/python/PythonAlgorithms/CMakeLists.txt
mantidproject · Apr 19, 2013 · a24121c · a24121c
2 parents e75305a + ffd2e80
commit a24121c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/test/python/CMakeLists.txt
@@ -8,5 +8,4 @@ if (PYUNITTEST_FOUND)
 
   add_subdirectory( mantid )
   add_subdirectory( plugins )
-  add_subdirectory( PythonAlgorithms ) # Temporary
 endif ()
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/PythonAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/test/python/PythonAlgorithms/CMakeLists.txt
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
@@ -3,12 +3,15 @@
 ##
 
 set ( TEST_PY_FILES
+  CheckForSampleLogsTest.py
   CreateWorkspaceTest.py
   DakotaChiSquaredTest.py
   FindReflectometryLinesTest.py
   MaskWorkspaceToCalFileTest.py
   RetrieveRunInfoTest.py
   Stitch1DTest.py
+  SuggestTibCNCSTest.py
+  SuggestTibHYSPECTest.py
   UpdatePeakParameterTableValueTest.py
 )
 

diff --git a/...ythonAlgorithms/CheckForSampleLogsTest.py → ...gins/algorithms/CheckForSampleLogsTest.py b/...ythonAlgorithms/CheckForSampleLogsTest.py → ...gins/algorithms/CheckForSampleLogsTest.py
diff --git a/...on/PythonAlgorithms/SuggestTibCNCSTest.py → .../plugins/algorithms/SuggestTibCNCSTest.py b/...on/PythonAlgorithms/SuggestTibCNCSTest.py → .../plugins/algorithms/SuggestTibCNCSTest.py
diff --git a/.../PythonAlgorithms/SuggestTibHYSPECTest.py → ...lugins/algorithms/SuggestTibHYSPECTest.py b/.../PythonAlgorithms/SuggestTibHYSPECTest.py → ...lugins/algorithms/SuggestTibHYSPECTest.py