-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 12541_new_resnorm_algorithm
Re #12541
- Loading branch information
Showing
284 changed files
with
99,096 additions
and
3,759 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| #!/bin/bash -ex | ||
| ############################################################################### | ||
| # LINUX/MAC SCRIPT TO DRIVE THE JENKINS DOCUMENTATION TESTS OF MANTID. | ||
| # | ||
| # Notes: | ||
| # | ||
| # WORKSPACE, JOB_NAME, NODE_LABEL GIT_COMMIT are environment variables that | ||
| # are set by Jenkins. The last one corresponds to any labels set on a slave. | ||
| # MANTID_DATA_STORE should be set in the configuration of each | ||
| # slave. | ||
| ############################################################################### | ||
|
|
||
| ############################################################################### | ||
| # Print out the versions of things we are using | ||
| ############################################################################### | ||
| cmake --version | ||
|
|
||
| ##################################################################################### | ||
| # Find and install package | ||
| ##################################################################################### | ||
| python $WORKSPACE/Code/Mantid/Testing/SystemTests/scripts/mantidinstaller.py install $WORKSPACE | ||
|
|
||
| ############################################################################### | ||
| # Set up the location for the local object store outside of the build and | ||
| # source tree, which can be shared by multiple builds. | ||
| # It defaults to a MantidExternalData directory within the HOME directory. | ||
| # It can be overridden by setting the MANTID_DATA_STORE environment variable. | ||
| ############################################################################### | ||
| if [ -z "$MANTID_DATA_STORE" ]; then | ||
| export MANTID_DATA_STORE=$HOME/MantidExternalData | ||
| fi | ||
|
|
||
| ############################################################################### | ||
| # RHEL6 setup steps - nodes must have a "rhel6" label set (in lowercase) | ||
| ############################################################################### | ||
| if [[ ${NODE_LABELS} == *rhel6* ]]; then | ||
| SCL_ON_RHEL6="scl enable mantidlibs34" | ||
| ON_RHEL6=true | ||
| else | ||
| SCL_ON_RHEL6="eval" | ||
| fi | ||
|
|
||
| ############################################################################### | ||
| # Create the build directory if it doesn't exist | ||
| ############################################################################### | ||
| [ -d $WORKSPACE/build ] || mkdir $WORKSPACE/build | ||
| cd $WORKSPACE/build | ||
|
|
||
| ############################################################################### | ||
| # CMake configuration. We only need a minimal configuration as we will actually | ||
| # just run from the package | ||
| ############################################################################### | ||
| $SCL_ON_RHEL6 "cmake -DMANTID_DATA_STORE=${MANTID_DATA_STORE} ../Code/Mantid" | ||
|
|
||
| ############################################################################### | ||
| # Build step | ||
| ############################################################################### | ||
| $SCL_ON_RHEL6 "cmake --build . -- StandardTestData" | ||
|
|
||
| ##################################################################################### | ||
| # Run tests | ||
| ##################################################################################### | ||
| # Create clean user properties with UsageData search path | ||
| userprops=~/.mantid/Mantid.user.properties | ||
| rm -f $userprops | ||
|
|
||
| data_binary_root=${WORKSPACE}/build/ExternalData | ||
| testdata_dir=${data_binary_root}/Testing/Data | ||
| instrument_dir=${WORKSPACE}/Code/Mantid/instrument | ||
| echo "datasearch.directories=${testdata_dir}/DocTest;${testdata_dir}/UnitTest;${instrument_dir}" > $userprops | ||
| echo "UpdateInstrumentDefinitions.OnStartup = 0" >> $userprops | ||
| echo "usagereports.enabled = 0" >> $userprops | ||
|
|
||
| set +e #don't immediately exit on failure so that we can remove the package | ||
| /opt/mantidnightly/bin/MantidPlot -xq docs/runsphinx_doctest.py | ||
| status=$? | ||
| set -e #exit on failures from now on | ||
|
|
||
| ##################################################################################### | ||
| # Remove package | ||
| ##################################################################################### | ||
| python $WORKSPACE/Code/Mantid/Testing/SystemTests/scripts/mantidinstaller.py uninstall $WORKSPACE | ||
|
|
||
| exit $status |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| setlocal enableextensions enabledelayedexpansion | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: WINDOWS SCRIPT TO DRIVE THE DOCUMENTATION TESTS OF MANTID | ||
| :: | ||
| :: Notes: | ||
| :: | ||
| :: WORKSPACE, JOB_NAME & NODE_LABEL are environment variables that | ||
| :: are set by Jenkins. The last one corresponds to any labels set on a slave. | ||
| :: MANTID_DATA_STORE should be set in the configuration of each slave. | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Print out the versions of things we are using | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| set CMAKE_BIN_DIR=C:\Program Files (x86)\CMake 2.8\bin | ||
| "%CMAKE_BIN_DIR%\cmake" --version | ||
| echo %sha1% | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Get or update the third party dependencies (basically just to get python) | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| cd %WORKSPACE%\Code | ||
| call fetch_Third_Party --libs-only win64 | ||
| cd %WORKSPACE% | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Find and install package | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| set PYTHON_EXE=%WORKSPACE%\Code\Third_Party\lib\win64\Python27\python.exe | ||
| set INSTALLER_SCRIPT=%WORKSPACE%/Code/Mantid/Testing/SystemTests/scripts/mantidinstaller.py | ||
| start "Install package" /B /WAIT %PYTHON_EXE% %INSTALLER_SCRIPT% install %WORKSPACE% | ||
| if ERRORLEVEL 1 exit /B %ERRORLEVEL% | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Update the PATH so that we can find everything for cmake | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| set PATH_AT_START=%PATH% | ||
| set PATH=%WORKSPACE%\Code\Third_Party\lib\win64;%WORKSPACE%\Code\Third_Party\lib\win64\Python27;%PATH% | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Set up the location for local object store outside of the build and source | ||
| :: tree, which can be shared by multiple builds. | ||
| :: It defaults to a MantidExternalData directory within the USERPROFILE | ||
| :: directory. It can be overridden by setting the MANTID_DATA_STORE environment | ||
| :: variable. | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| if NOT DEFINED MANTID_DATA_STORE ( | ||
| set MANTID_DATA_STORE=%USERPROFILE%\MantidExternalData | ||
| ) | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Setup the build directory | ||
| :: Remove build/ExternalData/**: data files will change over time and removing | ||
| :: the links helps keep it fresh | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| set BUILD_DIR=%WORKSPACE%\build | ||
| if EXIST %BUILD_DIR% ( | ||
| rmdir /S /Q %BUILD_DIR%\ExternalData | ||
| ) else ( | ||
| md %BUILD_DIR% | ||
| ) | ||
| cd %BUILD_DIR% | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: CMake configuration. We only need the doc-tests targets | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| "%CMAKE_BIN_DIR%\cmake" -G "Visual Studio 11 Win64" -DMANTID_DATA_STORE=!MANTID_DATA_STORE! ..\Code\Mantid | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Build step | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| msbuild /nologo /nr:false /p:Configuration=Release StandardTestData.vcxproj | ||
|
|
||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Run the tests | ||
| ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: | ||
| :: Reset the PATH so we don't pick up the 3rd party directory and use the | ||
| :: package instead | ||
| set PATH=%PATH_AT_START%;C:\MantidInstall\bin | ||
|
|
||
| ::Remove user properties, disable instrument updating & usage reports and add data paths | ||
| del /Q C:\MantidInstall\bin\Mantid.user.properties | ||
| echo UpdateInstrumentDefinitions.OnStartup = 0 > C:\MantidInstall\bin\Mantid.user.properties | ||
| echo usagereports.enabled = 0 >> C:\MantidInstall\bin\Mantid.user.properties | ||
| :: User properties file cannot contain backslash characters | ||
| set WORKSPACE_UNIX_STYLE=%WORKSPACE:\=/% | ||
| set DATA_ROOT=!WORKSPACE_UNIX_STYLE!/build/ExternalData/Testing/Data | ||
| echo datasearch.directories = !DATA_ROOT!/UnitTest;!DATA_ROOT!/DocTest;!WORKSPACE_UNIX_STYLE!/Code/Mantid/instrument >> C:\MantidInstall\bin\Mantid.user.properties | ||
|
|
||
| :: Run tests | ||
| C:\MantidInstall\bin\MantidPlot.exe -xq %BUILD_DIR%\docs\runsphinx_doctest.py | ||
| set RETCODE=!ERRORLEVEL! | ||
|
|
||
| start "Remove package" /B /WAIT %PYTHON_EXE% %INSTALLER_SCRIPT% uninstall %WORKSPACE% | ||
| if !RETCODE! NEQ 0 exit /B 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
Code/Mantid/Framework/API/inc/MantidAPI/IEventWorkspace_fwd.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #ifndef MANTID_API_IEVENTWORKSPACE_FWD_H_ | ||
| #define MANTID_API_IEVENTWORKSPACE_FWD_H_ | ||
|
|
||
| #include <boost/shared_ptr.hpp> | ||
|
|
||
| namespace Mantid { | ||
| namespace API { | ||
| /** | ||
| This file provides forward declarations for Mantid::API::IEventWorkspace | ||
| Copyright © 2015 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge | ||
| National Laboratory & European Spallation Source | ||
| This file is part of Mantid. | ||
| Mantid is free software; you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation; either version 3 of the License, or | ||
| (at your option) any later version. | ||
| Mantid is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| File change history is stored at: <https://github.com/mantidproject/mantid>. | ||
| Code Documentation is available at: <http://doxygen.mantidproject.org> | ||
| */ | ||
|
|
||
| /// forward declare of Mantid::API::IEventWorkspace | ||
| class IEventWorkspace; | ||
| /// shared pointer to Mantid::API::IEventWorkspace | ||
| typedef boost::shared_ptr<IEventWorkspace> IEventWorkspace_sptr; | ||
| /// shared pointer to Mantid::API::IEventWorkspace (const version) | ||
| typedef boost::shared_ptr<const IEventWorkspace> IEventWorkspace_const_sptr; | ||
|
|
||
| } // namespace API | ||
| } // namespace Mantid | ||
|
|
||
| #endif // MANTID_API_IEVENTWORKSPACE_FWD_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.