Merge remote-tracking branch 'origin/feature/9442_for_valgrind_jobs' (9cf7aaf0) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

9cf7aaf0

Commit 9cf7aaf0 authored 10 years ago by Peterson, Peter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/9442_for_valgrind_jobs'

Re #9442

Conflicts:
	Code/Mantid/Framework/Crystal/test/CMakeLists.txt

parents 2fec5cd3 d83da2a1

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/Algorithms/test/CMakeLists.txt 2 additions, 1 deletion

Code/Mantid/Framework/Algorithms/test/CMakeLists.txt
Code/Mantid/Framework/Crystal/test/CMakeLists.txt 2 additions, 1 deletion

Code/Mantid/Framework/Crystal/test/CMakeLists.txt
Code/Mantid/Framework/Crystal/test/SortHKLTest.h 1 addition, 1 deletion

Code/Mantid/Framework/Crystal/test/SortHKLTest.h
Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp 0 additions, 4 deletions

Code/Mantid/Framework/CurveFitting/src/DiffSphere.cpp
Code/Mantid/Framework/CurveFitting/test/CMakeLists.txt 1 addition, 0 deletions

Code/Mantid/Framework/CurveFitting/test/CMakeLists.txt
Code/Mantid/Framework/CurveFitting/test/CompositeFunctionTest.h 8 additions, 0 deletions

...antid/Framework/CurveFitting/test/CompositeFunctionTest.h
Code/Mantid/Framework/CurveFitting/test/DiffSphereTest.h 9 additions, 4 deletions

Code/Mantid/Framework/CurveFitting/test/DiffSphereTest.h
Code/Mantid/Framework/CurveFitting/test/valgrind.h 4840 additions, 0 deletions

Code/Mantid/Framework/CurveFitting/test/valgrind.h
Code/Mantid/Framework/DataHandling/test/CMakeLists.txt 1 addition, 0 deletions

Code/Mantid/Framework/DataHandling/test/CMakeLists.txt
Code/Mantid/Framework/LiveData/test/CMakeLists.txt 1 addition, 1 deletion

Code/Mantid/Framework/LiveData/test/CMakeLists.txt
Code/Mantid/Framework/LiveData/test/StartLiveDataTest.h 1 addition, 0 deletions

Code/Mantid/Framework/LiveData/test/StartLiveDataTest.h
Code/Mantid/Framework/MDAlgorithms/test/CMakeLists.txt 2 additions, 1 deletion

Code/Mantid/Framework/MDAlgorithms/test/CMakeLists.txt
Code/Mantid/Framework/WorkflowAlgorithms/test/CMakeLists.txt 1 addition, 0 deletions

Code/Mantid/Framework/WorkflowAlgorithms/test/CMakeLists.txt

with 4869 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment