Merge pull request #4192 from trilinos/master_merge_20190115_020612

Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190115_020612 branch to master
trilinos · Jan 16, 2019 · 59b802f · 59b802f
2 parents 407f01d + 49bc5dc
commit 59b802f
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 99 deletions.
diff --git a/cmake/ctest/drivers/rocketman/crontab b/cmake/ctest/drivers/rocketman/crontab
@@ -12,7 +12,14 @@ SHELL=/bin/bash
 
 # nightly tests
 
-0  22 * * * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log 
+0  22 * * * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log
+
+0  11 * * * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log
+
+#05  13 29 10 * cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log
+
+
+#25  11 22 6 5 cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; eval `python ./setSshEnv.py`; cd /home/nightlyTesting/trilinos; git pull > /dev/null 2>&1; cd /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman; ./cron_driver.sh &> /home/nightlyTesting/cron_driver.log; cd /home/nightlyTesting; /home/nightlyTesting/trilinos/cmake/ctest/drivers/rocketman/sendTestSummary.sh cron_driver.log
 
 #
 @reboot /home/jhu/bin/send-reboot-email.sh

diff --git a/cmake/ctest/drivers/windows/README.md b/cmake/ctest/drivers/windows/README.md
@@ -5,7 +5,7 @@ be worthwhile to browse the scripts for these locations. Alternatively, you coul
 and install the software wherever you want - just be sure to copy and update the build scripts
 with the correct locations.
 
-**[CMake][1]** - required to setup the build configuration. (Tested using version 3.8.1)
+**[CMake][1]** - required to setup the build configuration. (Tested using version 3.8.1, later upgraded to 3.12.0)
 
 **[Ninja][2]** - required to parallelize the build on Windows. (Tested using version 1.7.2)
 

diff --git a/cmake/ctest/drivers/windows/create_windows_package.bat b/cmake/ctest/drivers/windows/create_windows_package.bat
@@ -12,7 +12,7 @@ setlocal
 rem Set the location of Git, Ninja, etc.
 set SEMS_DIR=C:\projects\sems\install\win-x86_64
 set NINJA_DIR=%SEMS_DIR%\utility\ninja\1.7.2
-set CMAKE_DIR=%SEMS_DIR%\utility\cmake\3.8.1\bin
+set CMAKE_DIR=%SEMS_DIR%\utility\cmake\3.12.0\bin
 set GIT_EXE=%SEMS_DIR%\utility\git\2.13.0\cmd\git.exe
 set PATH=%NINJA_DIR%;%PATH%
 

diff --git a/cmake/ctest/drivers/windows/task_driver_windows.bat b/cmake/ctest/drivers/windows/task_driver_windows.bat
@@ -5,7 +5,7 @@ setlocal
 rem Set the location of Git, Ninja, etc.
 set SEMS_DIR=C:\projects\sems\install\win-x86_64
 set NINJA_DIR=%SEMS_DIR%\utility\ninja\1.7.2
-set CTEST_EXE=%SEMS_DIR%\utility\cmake\3.8.1\bin\ctest.exe
+set CTEST_EXE=%SEMS_DIR%\utility\cmake\3.12.0\bin\ctest.exe
 set GIT_EXE=%SEMS_DIR%\utility\git\2.13.0\cmd\git.exe
 set PATH=%NINJA_DIR%;%PATH%
 set TRILINOS_REPOSITORY_LOCATION=https://gitlab-ex.sandia.gov/trilinos-project/Trilinos.git

diff --git a/packages/teuchos/core/src/Teuchos_ScalarTraits.cpp b/packages/teuchos/core/src/Teuchos_ScalarTraits.cpp
@@ -105,7 +105,7 @@ bool Teuchos::operator&&(const qd_real &a, const qd_real &b) {
 #ifndef __sun
 // This is an intentional computation of NaN.
 namespace Teuchos {
-  const float  flt_nan = std::numeric_limits<float>::signaling_NaN();
-  const double dbl_nan = std::numeric_limits<double>::signaling_NaN();
+  const float  flt_nan = std::numeric_limits<float>::quiet_NaN();
+  const double dbl_nan = std::numeric_limits<double>::quiet_NaN();
 }
 #endif