Merge branch 'tribits_github_snapshot' into develop

Build/Test Cases Summary
Enabled Packages:
Disabled Packages: PyTrilinos,Claps,TriKota
Enabled all Packages
0) MPI_RELEASE_DEBUG_SHARED_PT => passed: passed=2570,notpassed=0 (106.46 min)
Other local commits for this build/test group: 1eb7e31, d64af4c, 1188e55, 2cc01a3, dd67e68

cmake/tribits/ci_support/CheckinTest.py

@@ -1460,11 +1460,12 @@ def runBuildTestCase(inOptions, tribitsGitRepos, buildTestCase, timings):
     # A.1) Set the base options
 
     cmakeBaseOptions = []
+    if inOptions.useNinja:
+      cmakeBaseOptions.append("-GNinja")
     if inOptions.extraCmakeOptions:
       cmakeBaseOptions.extend(commandLineOptionsToList(inOptions.extraCmakeOptions))
-
     cmakeBaseOptions.append(cmakeScopedDefine(projectName,
-      "TRIBITS_DIR:PATH", inOptions.tribitsDir))
+    "TRIBITS_DIR:PATH", inOptions.tribitsDir))
     cmakeBaseOptions.append(cmakeScopedDefine(projectName,
       "ENABLE_TESTS:BOOL", "ON"))
     cmakeBaseOptions.append(cmakeScopedDefine(projectName,
@@ -1576,7 +1577,10 @@ def runBuildTestCase(inOptions, tribitsGitRepos, buildTestCase, timings):
 
     if inOptions.doBuild and configurePassed:
 
-      cmnd = "make"
+      if inOptions.useNinja:
+        cmnd = "ninja"
+      else:
+        cmnd = "make"
       if inOptions.makeOptions:
         cmnd += " " + inOptions.makeOptions
 
@@ -1701,6 +1705,28 @@ def cleanBuildTestCaseOutputFiles(runBuildTestCaseBool, inOptions, baseTestDir,
       removeIfExists(getEmailSuccessFileName())
       echoChDir("..")
 
+def cleanBuildTestCaseSuccessFiles(runBuildTestCaseBool, inOptions, baseTestDir, \
+  buildTestCaseName \
+  ):
+
+  removeIfExists(buildTestCaseName+"/"+getConfigureSuccessFileName())
+  removeIfExists(buildTestCaseName+"/"+getBuildSuccessFileName())
+  removeIfExists(buildTestCaseName+"/"+getTestSuccessFileName())
+  removeIfExists(buildTestCaseName+"/"+getEmailSuccessFileName())
+  removeIfExists(buildTestCaseName+"/"+getEmailBodyFileName())
+  # NOTE: ABove, we need to delete the 'email.out' file otherwise it will get
+  # picked up in a later run of just a status check.  But this info is not
+  # really last because it is duplicated in the file
+  # commitStatusEmailBody.out.
+
+
+def cleanSuccessFiles(buildTestCaseList, inOptions, baseTestDir):
+  print("\nRemoving *.success files ...\n")
+  removeIfExists(getInitialPullSuccessFileName())
+  for buildTestCase in buildTestCaseList:
+    cleanBuildTestCaseSuccessFiles(
+      buildTestCase.runBuildTestCase, inOptions, baseTestDir, buildTestCase.name)
+
 
 def runBuildTestCaseDriver(inOptions, tribitsGitRepos, baseTestDir, buildTestCase, timings):
 
@@ -2084,6 +2110,8 @@ def checkinTest(tribitsDir, inOptions, configuration={}):
 
   success = True
 
+  didAtLeastOnePush = False
+
   timings = Timings()
 
   subjectLine = None
@@ -2572,7 +2600,7 @@ def checkinTest(tribitsDir, inOptions, configuration={}):
           abortedCommitPush = True
       else:
         okayToPush = False
-  
+
       if okayToPush:
         print("\n  => A PUSH IS READY TO BE PERFORMED!")
       else:
@@ -2779,8 +2807,6 @@ def checkinTest(tribitsDir, inOptions, configuration={}):
         #print("debugSkipPush =", debugSkipPush)
         #debugSkipPush = True
 
-        didAtLeastOnePush = False
-
         repoIdx = 0
         for gitRepo in tribitsGitRepos.gitRepoList():
 
@@ -2922,9 +2948,13 @@ def checkinTest(tribitsDir, inOptions, configuration={}):
           success = False
       else:
         if okayToPush:
-          subjectLine = "READY TO PUSH"
+          subjectLine = "PASSED (READY TO PUSH)"
         else:
-          subjectLine = "NOT READY TO PUSH"
+          if success:
+            subjectLine = "PASSED"
+          else:
+            subjectLine = "FAILED"
+          subjectLine += " (NOT READY TO PUSH)"
 
       #
       print("\n9.b) Create and send out push (or readiness status) notification email ...")
@@ -2985,6 +3015,8 @@ def checkinTest(tribitsDir, inOptions, configuration={}):
       print("\nNot performing push or sending out push readiness status on "
             "request!")
 
+    if pushPassed and didAtLeastOnePush and didPush:
+      cleanSuccessFiles(buildTestCaseList, inOptions, baseTestDir)
 
     print("\n***")
     print("*** 10) Run execute extra command on ready to push  ...")

cmake/tribits/ci_support/checkin-test.py

@@ -890,9 +890,21 @@ def runProjectTestsWithCommandLineArgs(commandLineArgs, configuration = {}):
     "-j", "--parallel", dest="overallNumProcs", type="string", default="",
     help="The options to pass to make and ctest (e.g. -j4)." )
 
+  clp.add_option(
+    "--use-makefiles", dest="useNinja", action="store_false",
+    help="If set, then -G'Unix Makfiles' used for backend build tool." \
+    +" Note: The command 'make' must be in the default path. [default]",
+    default=False )
+  clp.add_option(
+    "--use-ninja", dest="useNinja", action="store_true",
+    help="If set, then -GNinja used for backend build tool." \
+    +" Note: The comamnd 'ninja' must be in the default path." ,
+    default=False )
+
   clp.add_option(
     "--make-options", dest="makeOptions", type="string", default="",
-    help="The options to pass to make (e.g. -j4)." )
+    help="The options to pass to 'make' (e.g. -j4) or ninja" \
+    +" (if --use-ninja given)." )
 
   clp.add_option(
     "--ctest-options", dest="ctestOptions", type="string", default="",
@@ -934,7 +946,7 @@ def runProjectTestsWithCommandLineArgs(commandLineArgs, configuration = {}):
 
   clp.add_option(
     "--ss-extra-builds", dest="ssExtraBuilds", type="string", default="",
-    help="DEPRECATED!  Use --st-extra-builds instead!." )
+    help="DEPRECATED!  Use --st-extra-builds instead!. (Default empty "")" )
 
   clp.add_option(
     "--extra-builds", dest="extraBuilds", type="string", default="",
@@ -943,6 +955,10 @@ def runProjectTestsWithCommandLineArgs(commandLineArgs, configuration = {}):
     +" the local directory along side the COMMON.config file that defines the special" \
     +" build options for the extra build." )
 
+  clp.add_option(
+    "--log-file", dest="logFile", type="string", default="checkin-test.out",
+    help="File used for detailed log info." )
+
   clp.add_option(
     "--send-email-to", dest="sendEmailTo", type="string",
     default=getCmndOutput("git config --get user.email", True, False),
@@ -973,10 +989,6 @@ def runProjectTestsWithCommandLineArgs(commandLineArgs, configuration = {}):
     +" is not empty. [default = 'always']",
     clp )
 
-  clp.add_option(
-    "--log-file", dest="logFile", type="string", default="",
-    help="File used for detailed log info." )
-
   clp.add_option(
     "--send-email-for-all", dest="sendEmailOnlyOnFailure", action="store_false",
     help="If set, then emails will get sent out for all operations. [default]" )
@@ -1171,6 +1183,10 @@ def runProjectTestsWithCommandLineArgs(commandLineArgs, configuration = {}):
   print "  --test-categories='"+options.testCategories+"' \\"
   if options.overallNumProcs:
     print "  -j"+options.overallNumProcs+" \\"
+  if options.useNinja:
+    print "  --use-ninja \\"
+  else:
+    print "  --use-makefiles \\"
   print "  --make-options='"+options.makeOptions+"' \\"
   print "  --ctest-options='"+options.ctestOptions+"' \\"
   print "  --ctest-timeout="+str(options.ctestTimeOut)+" \\"
@@ -1182,6 +1198,7 @@ def runProjectTestsWithCommandLineArgs(commandLineArgs, configuration = {}):
     print "  --without-default-builds \\"
   print "  --st-extra-builds='"+options.stExtraBuilds+"' \\"
   print "  --extra-builds='"+options.extraBuilds+"' \\"
+  print "  --log-file='"+options.logFile+"' \\"
   print "  --send-email-to='"+options.sendEmailTo+"' \\"
   if options.skipCaseSendEmail:
     print "  --skip-case-send-email \\"