From ff55851e2950f1b8c02edf14768f1998be978a59 Mon Sep 17 00:00:00 2001
From: "Jonathan R. Madsen" <jonathanrmadsen@gmail.com>
Date: Thu, 7 Jun 2018 13:56:36 -0700
Subject: [PATCH] CDash/CTest updates + cdash.nersc.gov

- migrated CDash dashboard to cdash.nersc.gov (requires token + https)
- fixed double submission in cdash/Submit.cmake
---
 CTestConfig.cmake                     | 6 +++---
 cmake/Templates/cdash/Init.cmake.in   | 1 -
 cmake/Templates/cdash/Submit.cmake.in | 6 +++++-
 setup.py                              | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 66b389180..883cab792 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -29,9 +29,9 @@ endif(NOT DEFINED CTEST_SITE)
 
 set(CTEST_PROJECT_NAME          "TiMemory")
 set(CTEST_NIGHTLY_START_TIME    "01:00:00 PDT")
-set(CTEST_DROP_METHOD           "http")
-set(CTEST_DROP_SITE             "jonathan-madsen.info")
-set(CTEST_DROP_LOCATION         "/cdash/public/submit.php?project=TiMemory")
+set(CTEST_DROP_METHOD           "https")
+set(CTEST_DROP_SITE             "cdash.nersc.gov")
+set(CTEST_DROP_LOCATION         "/submit.php?project=${CTEST_PROJECT_NAME}")
 set(CTEST_DROP_SITE_CDASH       TRUE)
 set(CTEST_CDASH_VERSION         "1.6")
 set(CTEST_CDASH_QUERY_VERSION   TRUE)
diff --git a/cmake/Templates/cdash/Init.cmake.in b/cmake/Templates/cdash/Init.cmake.in
index df00ba51b..48dfd10c1 100644
--- a/cmake/Templates/cdash/Init.cmake.in
+++ b/cmake/Templates/cdash/Init.cmake.in
@@ -285,7 +285,6 @@ macro(SUBMIT KEY)
     if("${TRIGGER}" STREQUAL "Any" OR "${TRIGGER}" STREQUAL "Submit")
         read_notes()
         submit_command(${ARGN})
-        ctest_submit(RETURN_VALUE ret ${ARGN})
     else("${TRIGGER}" STREQUAL "Any" OR "${TRIGGER}" STREQUAL "Submit")
         if("${TRIGGER}" STREQUAL "${KEY}")
             submit_command(${ARGN})
diff --git a/cmake/Templates/cdash/Submit.cmake.in b/cmake/Templates/cdash/Submit.cmake.in
index 365da93b9..9ee128278 100644
--- a/cmake/Templates/cdash/Submit.cmake.in
+++ b/cmake/Templates/cdash/Submit.cmake.in
@@ -9,7 +9,11 @@ set(TRIGGER "Submit" CACHE STRING "Delay submit until TRIGGER == '(Any|Build|Tes
 
 include("${CMAKE_CURRENT_LIST_DIR}/Init.cmake")
 
-setup(Submit)
+unset(CTEST_CHECKOUT_COMMAND)
+configure_ctest_files()
+ctest_start(${MODEL}   TRACK ${MODEL} APPEND)
+configure_ctest_files()
+ctest_read_custom_files("${CTEST_BINARY_DIRECTORY}")
 submit(Submit RETRY_COUNT 5 RETRY_DELAY 30)
 
 message(" -- Finished ${MODEL} Submission - ${CTEST_BUILD_NAME} --")
diff --git a/setup.py b/setup.py
index 3096816dd..44b14b2fc 100644
--- a/setup.py
+++ b/setup.py
@@ -161,7 +161,7 @@ def compose(str):
                 if install.user_options[0][1] is None:
                     self.devel_install = sys.prefix
                 else:
-                    self.devel_install = unstall.user_options[0][1]
+                    self.devel_install = install.user_options[0][1]
             devel_install_path = self.devel_install
             if not os.path.isabs(devel_install_path):
                 devel_install_path = os.path.realpath(devel_install_path)