mesa_test 0.0.24 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2b622d9f1d9572a01e95e1241f6137657a1353f
-  data.tar.gz: ef68a62fc75bbb5bbd4bd7be2f96482009fe24e0
+SHA256:
+  metadata.gz: e42b738498fdc133b5bb6a6f79e669042a635df47b13bc0447c96b0f1695f369
+  data.tar.gz: 52fb25fcb3561cf196459422c54c339c6d7500026c487448017a7c7878726276
 SHA512:
-  metadata.gz: 62b5a24bd389978818f8cb6272d5c62feabbe842b6318e2c756a7f9a8791a7f1053586a9bf4abe31594473b04b74c1fc02f9aa163c7ff1bd547ce181633d676c
-  data.tar.gz: 11e6d07143ed78de2929dfe3b50e79bd1b0ea224ed3367690bcb26bbea0b56b24be43c8ed63a6490e5a227f3849814f507242dd23de8f9d069c37ff0b8bb8b0e
+  metadata.gz: 4d3bfa26356589fa5201c765916179164f23cfc3dd928e13a18cd2b4ba923c8d18f4cf4a73b97d86826106cd39813f258f62f929d97791f653141b3d50c20e7d
+  data.tar.gz: fcf9b6814d87ab717388e93f6fce7425673d4287e14cadef00242a3657c64777bb3dc869a7c527ea387a5c49838987715114c076b55e4522b693fb732c15971c

data/bin/mesa_test

@@ -2,7 +2,7 @@
 
 # if true, submit cases to localhost:3000 and load local mesa_test library
 # rather than system version
-DEVELOPMENT_MODE = false
+DEVELOPMENT_MODE = true
 
 if DEVELOPMENT_MODE
   require_relative '../lib/mesa_test'
@@ -11,6 +11,7 @@ else
 end
 
 require 'thor'
+require 'yaml'
 
 class MesaTest < Thor
   DEVELOPMENT_URI = 'http://localhost:3000'.freeze
@@ -36,31 +37,33 @@ class MesaTest < Thor
   searched/concatenated in this order:
 
   #{MesaTestCase.modules.map { |mod| '    ' + mod.to_s }.join(', ')}
-
-  With --diff option, assume the checksums are up-to-date (behave like
-  each_test_run_and_diff), off by default.
-
-  With --force option, skip confirmation of computer details, assuming values
-  in ~/.mesa_test.yml are correct.
-
-  With --module option, select which module to search through, with the default
-  being "all" (search all modules in order). Example: --module=star.
-
-  With --log option, save yml file of test results in test directory, on
-  by default. Shut off with --no-log.
-
-  With --submit option, upload results to MESATestHub. By default, this is on.
-  To run without submission, use --no-submit.
   LONGDESC
-  option :diff, type: :boolean, default: false
-  option :force, type: :boolean, aliases: '-f'
-  option :log, type: :boolean, default: true
-  option :module, type: :string, default: :all
-  option :submit, type: :boolean, default: true
+  option :force, desc: 'When submitting, assume submission data in ' +
+                       '~/.mesa_test.yml are correct rather than checking ' +
+                       'with user.', type: :boolean, default: false,
+                       aliases: '-f'
+  option :submit, desc: 'Submit results (if any) to MesaTestHub.',
+                  type: :boolean, default: true
+  option :diff, type: :boolean, default: false, desc: 'Assume checksums are ' + 
+                'up to date and perform diff', aliases: '-d'
+  option :svn, desc: 'Use svn to gather log/version data. Safe to use when ' +
+               'also using --no-submit; else may give bad version numbers.',
+               type: :boolean, default: true
+  option :set_sdk, desc: 'Override user- and test-generated data to deterine' +
+                   ' if the SDK is used and instead use value of --using_sdk.',
+                   type: :boolean, default: false
+  option :using_sdk, desc: 'Assume we are using the SDK and automatically ' +
+                     'determine SDK version. Ignored unless using --set-sdk).',
+                     type: :boolean, default: true
+  option :module, desc: 'Which module to test and/or submit, if applicable.',
+                  type: :string, default: 'all', aliases: '-m'                  
+  option :log, type: :boolean, default: true, desc: 'Save yml file of test ' \
+               'results in test case directory.'
   def test_one(mesa_dir, test_case_name)
     s = create_and_check_submitter(force: options[:force]) if options[:submit]
     m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
-                              mod: options[:module].downcase.to_sym)
+                              mod: options[:module].downcase.to_sym,
+                              use_svn: options[:svn], using_sdk: using_sdk?(s))
     t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
                                    mod: options[:module].downcase.to_sym)
 
@@ -80,52 +83,6 @@ class MesaTest < Thor
     puts "Done.\n"
   end
 
-  desc 'test_all MESA_DIR', 'run, check, and submit all test cases'
-  long_desc <<-LONGDESC
-  Run and check all test cases residing in MESA_DIR/star/test_suite. Then
-  report results to MesaTestHub. Specifically, runs and checks all tests
-  detailed in MESA_DIR/star/test_suite/do1_test_source.
-
-  With --diff option, assume the checksums are up-to-date (behave like
-  each_test_run_and_diff), off by default.
-
-  With --force option, skip confirmation of computer details, assuming values
-  in ~/.mesa_test.yml are correct. Only relevant if --submit option is on
-  (by default it is).
-
-  With --module option, select which module to search through, with the default
-  being "all" (search all modules in order). Example: --module=star.
-
-  With --log option, save yml file of test results in test directory and a
-  summary in the test suite directory. On by default. Shut off with --no-log.
-
-  With --submit option, upload results to MESATestHub. By default, this is on.
-  To run without submission, use --no-submit.
-
-  With --svn option, confirm version number with svn rather than trusting 
-  self-reported version number. By default, this is on. To run without using
-  svn, use --no-svn.
-  LONGDESC
-  option :diff, type: :boolean, default: false
-  option :force, type: :boolean, aliases: '-f'
-  option :log, type: :boolean, default: true
-  option :module, type: :string, default: :all
-  option :submit, type: :boolean, default: true
-  option :svn, type: :boolean, default: true
-  def test_all(mesa_dir)
-    s = create_and_check_submitter(force: options[:force]) if options[:submit]
-    m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
-                              mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn])
-
-    # run all tests
-    m.each_test_run_and_diff(log_results: options[:log],
-                             mod: options[:module].downcase.to_sym)
-
-    # submit all tests
-    s.submit_all(m, options[:module].downcase.to_sym) if options[:submit]
-  end
-
   desc 'test_revision MESA_DIR', 'test and submit all tests as a packaged version'
   long_desc <<-LONGDESC
   Run and check all test cases residing in MESA_DIR/star/test_suite. Then
@@ -133,38 +90,34 @@ class MesaTest < Thor
   detailed in MESA_DIR/star/test_suite/do1_test_source. Also submit version
   information with test instances. Submits all test instances and version data
   in a single request rather than case-by-case in `test_all`.
-
-  With --diff option, assume the checksums are up-to-date (behave like
-  each_test_run_and_diff), off by default.
-
-  With --force option, skip confirmation of computer details, assuming values
-  in ~/.mesa_test.yml are correct. Only relevant if --submit option is on
-  (by default it is).
-
-  With --module option, select which module to search through, with the default
-  being "all" (search all modules in order). Example: --module=star.
-
-  With --log option, save yml file of test results in test directory and a
-  summary in the test suite directory. On by default. Shut off with --no-log.
-
-  With --submit option, upload results to MESATestHub. By default, this is on.
-  To run without submission, use --no-submit.
-
-  With --svn option, get version info (number, author, commit message) from
-  svn. By default, this is on. To shut off, use --no-svn. If off, no author or
-  commit message are saved.
   LONGDESC
-  option :diff, type: :boolean, default: false
-  option :force, type: :boolean, aliases: '-f'
-  option :log, type: :boolean, default: true
-  option :module, type: :string, default: :all
-  option :submit, type: :boolean, default: true
-  option :svn, type: :boolean, default: true  
+
+  option :force, desc: 'When submitting, assume submission data in ' +
+                       '~/.mesa_test.yml are correct rather than checking ' +
+                       'with user.', type: :boolean, default: false,
+                       aliases: '-f'
+  option :submit, desc: 'Submit results (if any) to MesaTestHub.',
+                  type: :boolean, default: true
+  option :diff, type: :boolean, default: false, desc: 'Assume checksums are ' + 
+                'up to date and perform diff', aliases: '-d'
+  option :svn, desc: 'Use svn to gather log/version data. Safe to use when ' +
+               'also using --no-submit; else may give bad version numbers.',
+               type: :boolean, default: true
+  option :set_sdk, desc: 'Override user- and test-generated data to deterine' +
+                   ' if the SDK is used and instead use value of --using_sdk.',
+                   type: :boolean, default: false
+  option :using_sdk, desc: 'Assume we are using the SDK and automatically ' +
+                     'determine SDK version. Ignored unless using --set-sdk).',
+                     type: :boolean, default: true
+  option :module, desc: 'Which module to test and/or submit, if applicable.',
+                  type: :string, default: 'all', aliases: '-m'                  
+  option :log, type: :boolean, default: true, desc: 'Save yml file of test ' \
+               'results in test case directory.'
   def test_revision(mesa_dir)
     s = create_and_check_submitter(force: options[:force]) if options[:submit]
     m = create_and_check_mesa(mesa_dir: mesa_dir, diff: options[:diff],
                               mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn])
+                              use_svn: options[:svn], using_sdk: using_sdk?(s))
 
     # run all tests
     m.each_test_run_and_diff(log_results: options[:log],
@@ -183,19 +136,27 @@ class MesaTest < Thor
   no module is specified). Modules are searched/concatenated in this order:
 
   #{MesaTestCase.modules.map { |mod| '    ' + mod.to_s }.join(', ')}
-
-  With --force option, skip confirmation of computer details, assuming values
-  in ~/.mesa_test.yml are correct.
-
-  With --module option, select which module to search through, with the default
-  being "all". Example: --module=star.
   LONGDESC
-  option :force, type: :boolean, aliases: '-f'
-  option :module, type: :string, aliases: '-m', default: 'all'
+
+  option :force, desc: 'When submitting, assume submission data in ' +
+                       '~/.mesa_test.yml are correct rather than checking ' +
+                       'with user.', type: :boolean, default: false,
+                       aliases: '-f'
+  option :svn, desc: 'Use svn to gather log/version data. NECESSARY TO GET ' +
+               'ACCURATE VERSION NUMBER.', type: :boolean, default: true
+  option :set_sdk, desc: 'Override user- and test-generated data to deterine' +
+                   ' if the SDK is used and instead use value of --using_sdk.',
+                   type: :boolean, default: false
+  option :using_sdk, desc: 'Assume we are using the SDK and automatically ' +
+                     'determine SDK version. Ignored unless using --set-sdk).',
+                     type: :boolean, default: true
+  option :module, desc: 'Which module to test and/or submit, if applicable.',
+                  type: :string, default: 'all', aliases: '-m'
   def submit_one(mesa_dir, test_case_name)
     s = create_and_check_submitter(force: options[:force])
     m = create_and_check_mesa(mesa_dir: mesa_dir,
-                              mod: options[:module].downcase.to_sym)
+                              mod: options[:module].downcase.to_sym,
+                              using_sdk: using_sdk?(s), use_svn: options[:svn])
     t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
                                    mod: options[:module].downcase.to_sym)
     # load test results
@@ -207,38 +168,6 @@ class MesaTest < Thor
     puts "Done.\n"
   end
 
-  desc 'submit_all MESA_DIR', 'submit all [previously run] test cases'
-  long_desc <<-LONGDESC
-  Load results for all test cases residing in MESA_DIR/star/test_suite. Then
-  submit results to MesaTestHub. Specifically, loads and submits all tests
-  detailed in MESA_DIR/star/test_suite/do1_test_source.
-
-  With --force option, skip confirmation of computer details, assuming values
-  in ~/.mesa_test.yml are correct.
-
-  With --module option, select which module to search through, with the default
-  being "all" (search all modules in order). Example: --module=star.
-
-  With --svn option, confirm version number with svn rather than trusting 
-  self-reported version number. By default, this is on. To run without using
-  svn, use --no-svn.  
-  LONGDESC
-  option :force, type: :boolean, aliases: '-f'
-  option :module, type: :string, aliases: '-m', default: 'all'
-  option :svn, type: :boolean, default: true
-  def submit_all(mesa_dir)
-    s = create_and_check_submitter(force: options[:force])
-    m = create_and_check_mesa(mesa_dir: mesa_dir,
-                              mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn])
-
-    # load all test data
-    m.each_test_load_results(mod: options[:module].downcase.to_sym)
-
-    # submit all tests
-    s.submit_all(m, options[:module].downcase.to_sym)
-  end
-
   desc 'submit_revision MESA_DIR', 'submit version with pre-run test cases'
   long_desc <<-LONGDESC
   Load results for all test cases residing in MESA_DIR/star/test_suite. Then
@@ -247,31 +176,38 @@ class MesaTest < Thor
   (number, author, and commit message). Unlike submit_all, this submits all
   test cases AND version info in a single request rather than just the cases
   in series.
-
-  With --force option, skip confirmation of computer details, assuming values
-  in ~/.mesa_test.yml are correct.
-
-  With --module option, select which module to search through, with the default
-  being "all" (search all modules in order). Example: --module=star.
-
-  With --svn option, get version info (number, author, commit message) from
-  svn. By default, this is on. To shut off, use --no-svn. If off, no author or
-  commit message are submitted.
   LONGDESC
-  option :force, type: :boolean, aliases: '-f'
-  option :module, type: :string, aliases: '-m', default: 'all'
-  option :svn, type: :boolean, default: true  
+  option :force, desc: 'When submitting, assume submission data in ' +
+                       '~/.mesa_test.yml are correct rather than checking ' +
+                       'with user.', type: :boolean, default: false,
+                       aliases: '-f'
+  option :module, desc: 'Which module to test and/or submit, if applicable.',
+                  type: :string, default: 'all', aliases: '-m'                       
+  option :svn, desc: 'Use svn to gather log/version data. NECESSARY TO GET ' +
+               'ACCURATE VERSION NUMBER.', type: :boolean, default: true
+  option :set_sdk, desc: 'Override user- and test-generated data to deterine' +
+                   ' if the SDK is used and instead use value of --using_sdk.',
+                   type: :boolean, default: false
+  option :using_sdk, desc: 'Assume we are using the SDK and automatically ' +
+                     'determine SDK version. Ignored unless using --set-sdk).',
+                     type: :boolean, default: true
   def submit_revision(mesa_dir)
     s = create_and_check_submitter(force: options[:force])
     m = create_and_check_mesa(mesa_dir: mesa_dir,
                               mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn])
-
-    # load all test data
-    m.each_test_load_results(mod: options[:module].downcase.to_sym)
-
-    # submit all tests
-    s.submit_revision(m)
+                              use_svn: options[:svn], using_sdk: using_sdk?(s))
+    begin
+      m.check_installation
+    rescue MesaDirError
+      shell.say %q{This MESA installation doesn't seem to be compiled } \
+        'properly. Submitting a compilation failure to MESATestHub.', :red
+    else
+      # load all test data
+      m.each_test_load_results(mod: options[:module].downcase.to_sym)
+    ensure
+      # submit all tests
+      s.submit_revision(m)
+    end
   end
 
 
@@ -289,76 +225,6 @@ class MesaTest < Thor
     m.install
   end
 
-  desc 'install_and_test_all VERSION_NUMBER MESA_DIR', 'download and install '\
-  'mesa release VERSION_NUMBER to directory MESA_DIR and run/submit all tests'
-  long_desc <<-LONGDESC
-  Calls to svn to install mesa release VERSION_NUMBER into the directory
-  MESA_DIR. Basically just an svn checkout followed by going into the directory
-  and running ./clean and ./install. SDK or compilers must be set up prior.
-  Once installation is complete, run the test suite, and report results to
-  MesaTestHub. Does not affect the user's MESA_DIR or other environment
-  variables. This is basically a shortcut for running
-
-    `mesa_test install SOME_VERSION SOME_DIR`
-
-  followed by
-
-    `mesa_test test_all SOME_DIR`
-
-  If VERSION_NUMBER is 'non-paxton' or 'non_paxton', then the most recent
-  commit by anyone other than Bill Paxton ('bill_paxton') is tested and the
-  --diff flag is ignored and set to false. Note that using 'HEAD' for version
-  number will automatically select the most recent release, regardless of the
-  author.
-
-  With --diff option, assume the checksums are up-to-date (behave like
-  each_test_run_and_diff), off by default.
-
-  Use flag --destroy to self destruct MESA_DIR after successful test
-  submission. Essentially does rm -rf MESA_DIR after the test suite. Useful
-  for automated testing without piling up disk space.
-
-  Use flag --force to skip confirmation of computer details if they can be
-  read from ~/.mesa_test.yml.
-
-  With --log option, save yml file of test results in test directory and a
-  summary in the test suite directory. On by default. Shut off with --no-log.
-
-  With --module option, select which module to search through, with the default
-  being "all". Example: --module=star.
-  LONGDESC
-  option :diff, type: :boolean, default: false
-  option :destroy, type: :boolean
-  option :log, type: :boolean, default: true
-  option :force, type: :boolean, aliases: '-f'
-  option :module, type: :string, aliases: '-m', default: 'all'
-  def install_and_test_all(version, mesa_dir)
-    s = create_and_check_submitter(force: options[:force])
-    mesa_version, diff = filter_version_and_diff(version, s)
-    if mesa_version.nil?
-      puts 'No commits by anyone other than Bill Paxton since '\
-        "r#{s.last_tested}. Exiting."
-      return
-    end
-    m = Mesa.download(version_number: mesa_version, new_mesa_dir: mesa_dir)
-    m.clean
-    m.install
-
-    m = create_and_check_mesa(mesa_dir: mesa_dir, diff: diff,
-                              mod: options[:module].downcase.to_sym)
-
-    # run all tests. Don't be fooled, whether or not a diff happens is set
-    # by the diff attribute of the mesa object, set above.
-    m.each_test_run_and_diff(mod: options[:module].downcase.to_sym,
-                             log_results: options[:log])
-
-    # submit all tests
-    successfully_submitted = s.submit_all(m, options[:module].downcase.to_sym)
-
-    # if requested, and if submission successful, destroy the directory
-    m.destroy if successfully_submitted && options[:destroy]
-  end
-
   desc 'install_and_test_revision VERSION_NUMBER MESA_DIR', 'download and '\
   'install mesa release VERSION_NUMBER to directory MESA_DIR, run all tests,'\
   'and submit version and test data in single request.'
@@ -383,35 +249,37 @@ class MesaTest < Thor
   --diff flag is ignored and set to false. Note that using 'HEAD' for version
   number will automatically select the most recent release, regardless of the
   author.
-
-  With --diff option, assume the checksums are up-to-date (behave like
-  each_test_run_and_diff), off by default.
-
-  Use flag --destroy to self destruct MESA_DIR after successful test
-  submission. Essentially does rm -rf MESA_DIR after the test suite. Useful
-  for automated testing without piling up disk space.
-
-  Use flag --force to skip confirmation of computer details if they can be
-  read from ~/.mesa_test.yml.
-
-  With --log option, save yml file of test results in test directory and a
-  summary in the test suite directory. On by default. Shut off with --no-log.
-
-  With --module option, select which module to search through, with the default
-  being "all". Example: --module=star.
-
-  With --svn option, get version info (number, author, commit message) from
-  svn. By default, this is on. To shut off, use --no-svn. If off, no author or
-  commit message are submitted.  
   LONGDESC
-  option :diff, type: :boolean, default: false
-  option :destroy, type: :boolean
-  option :log, type: :boolean, default: true
-  option :force, type: :boolean, aliases: '-f'
-  option :module, type: :string, aliases: '-m', default: 'all'
-  option :svn, type: :boolean, default: true
+
+  option :force, desc: 'When submitting, assume submission data in ' +
+                       '~/.mesa_test.yml are correct rather than checking ' +
+                       'with user.', type: :boolean, default: false,
+                       aliases: '-f'
+  option :submit, desc: 'Submit results (if any) to MesaTestHub.',
+                  type: :boolean, default: true
+  option :diff, type: :boolean, default: false, desc: 'Assume checksums are ' + 
+                'up to date and perform diff', aliases: '-d'
+  option :svn, desc: 'Use svn to gather log/version data. Safe to use when ' +
+               'also using --no-submit; else may give bad version numbers.',
+               type: :boolean, default: true
+  option :set_sdk, desc: 'Override user- and test-generated data to deterine' +
+                   ' if the SDK is used and instead use value of --using_sdk.',
+                   type: :boolean, default: false
+  option :using_sdk, desc: 'Assume we are using the SDK and automatically ' +
+                     'determine SDK version. Ignored unless using --set-sdk).',
+                     type: :boolean, default: true
+  option :module, desc: 'Which module to test and/or submit, if applicable.',
+                  type: :string, default: 'all', aliases: '-m'
+  option :destroy, type: :boolean, desc: 'Delete mesa installation upon ' \
+                   'submission of complete results.', default: false
+  option :log, type: :boolean, default: true, desc: 'Save yml file of test ' \
+               'results in test case directory.'
+  # option :force, type: :boolean, aliases: '-f'
+  # option :module, type: :string, aliases: '-m', default: 'all'
+  # option :svn, type: :boolean, default: true
   def install_and_test_revision(version, mesa_dir)
-    s = create_and_check_submitter(force: options[:force])
+    s = nil  # to make sure using_sdk? below will work properly
+    s = create_and_check_submitter(force: options[:force]) if options[:submit]
     mesa_version, diff = filter_version_and_diff(version, s)
     if mesa_version.nil?
       puts 'No commits by anyone other than Bill Paxton since '\
@@ -419,24 +287,33 @@ class MesaTest < Thor
       return
     end
     m = Mesa.download(version_number: mesa_version, new_mesa_dir: mesa_dir,
-                      use_svn: options[:svn])
-    m.clean
-    m.install
-
-    m = create_and_check_mesa(mesa_dir: mesa_dir, diff: diff,
-                              mod: options[:module].downcase.to_sym,
-                              use_svn: options[:svn])
-
-    # run all tests. Don't be fooled, whether or not a diff happens is set
-    # by the diff attribute of the mesa object, set above.
-    m.each_test_run_and_diff(mod: options[:module].downcase.to_sym,
-                             log_results: options[:log])
-
-    # submit all tests
-    successfully_submitted = s.submit_revision(m)
-
-    # if requested, and if submission successful, destroy the directory
-    m.destroy if successfully_submitted && options[:destroy]
+                      use_svn: options[:svn], using_sdk: using_sdk?(s))
+    begin
+      m.clean
+      m.install
+    rescue MesaDirError
+      shell.say "\nFailed in compiling MESA r-#{m.version_number}.", :red
+    else
+      check_mesa(m)
+      update_mesa(mesa: m, diff: diff, mod: options[:module].downcase.to_sym)
+
+      # m = create_and_check_mesa(mesa_dir: mesa_dir, diff: diff,
+      #                           mod: options[:module].downcase.to_sym,
+      #                           use_svn: options[:svn])
+
+      # run all tests. Don't be fooled, whether or not a diff happens is set
+      # by the diff attribute of the mesa object, set above.
+      m.each_test_run_and_diff(mod: options[:module].downcase.to_sym,
+                               log_results: options[:log])
+    ensure
+      # submit all version and test data
+      successfully_submitted = false
+      successfully_submitted = s.submit_revision(m) if options[:submit]
+
+      # if requested, installation and submission are successful, destroy the
+      # directory
+      m.destroy if successfully_submitted && options[:destroy] && m.installed?
+    end
   end  
 
   private
@@ -464,17 +341,25 @@ class MesaTest < Thor
     s
   end
 
-  def create_and_check_mesa(mesa_dir:, diff: true, mod: :all, use_svn: true)
-    m = Mesa.new mesa_dir: mesa_dir, use_svn: use_svn
-    unless m.installed?
+  def create_and_check_mesa(mesa_dir:, use_svn: true, diff: true, mod: :all,
+                            using_sdk: true)
+    m = Mesa.new(mesa_dir: mesa_dir, use_svn: use_svn, using_sdk: using_sdk)
+    check_mesa(m)
+    update_mesa(mesa: m, diff: diff, mod: mod)
+    m
+  end
+
+  def check_mesa(mesa)
+    unless mesa.downloaded?
       raise MesaDirError, "Invalid MESA_DIR: #{mesa_dir}. Please download " \
       'and install a valid MESA version or provide the path to one.'
     end
-    m.load_test_source_data(mod: mod)
+  end
 
+  def update_mesa(mesa:, diff: true, mod: :all)
+    mesa.load_test_source_data(mod: mod)
     # choose whether to update checksums
-    m.update_checksums = !diff
-    m
+    mesa.update_checksums = !diff
   end
 
   def create_and_check_test_case(mesa:, test_case_name:, mod: :all)
@@ -486,7 +371,7 @@ class MesaTest < Thor
     # this should care about the value in `mod`. Current behavior is only
     # appropriate if `mod` is :all.
     msg << MesaTestCase.modules.map do |this_mod|
-      File.join(m.test_suite_dir(mod: this_mod), 'do1_test_source')
+      File.join(mesa.test_suite_dir(mod: this_mod), 'do1_test_source')
     end.join(' or ')
     msg << '.'
     raise TestCaseDirError, msg
@@ -499,6 +384,36 @@ class MesaTest < Thor
       [version, options[:diff]]
     end
   end
+
+  # determine whether or not we can assume the test should be / was run with
+  # the SDK. This results should only be relevant if a test is GOING TO BE RUN.
+  # If it has already been run, then the compiler and compiler version have
+  # already been set (or the opportunity was lost, either way this won't help.)
+  # 
+  # This gets used in a lot of places where it probably isn't necessary, just 
+  # to prevent problems later on if things change, as it does no harm when it
+  # doesn't help.
+  # 
+  # The only parameter is a submitter, if there is one to lean on. If there
+  # isn't, it's no problem.
+  def using_sdk?(s = nil)
+    # did user specify so? Trust them
+    if options[:set_sdk]
+      options[:using_sdk]
+    # are we submitting? scrape compiler info from that
+    elsif s
+      s.compiler == 'SDK'
+    # we don't have a submitter... need to read config file (same thing 
+    # submitter is doing)
+    elsif File.exist?(File.join(ENV['HOME'], '.mesa_test.yml'))
+      data = YAML.load(File.read(File.join(ENV['HOME'], '.mesa_test.yml')))
+      data['compiler'] == 'SDK'
+    # nothing works. Don't tell mesa that we are using SDK (we could still be
+    # using it, but it's up to a future submitter to tell the web site so.)
+    else
+      false
+    end
+  end
 end
 
 # actually start the CLI

data/lib/mesa_test.rb

@@ -231,6 +231,8 @@ e-mail and password will be stored in plain text.'
   end
 
   # create and return hash of parameters for a TestInstance submission
+  # Note: prefer test case's self-reported compiler and compiler version over
+  # user reported
   def submit_params(test_case)
     res = {
       test_case: test_case.test_name,
@@ -241,8 +243,8 @@ e-mail and password will be stored in plain text.'
       runtime_seconds: test_case.runtime_seconds,
       mesa_version: test_case.mesa_version,
       passed: test_case.passed? ? 1 : 0,
-      compiler: compiler,
-      compiler_version: compiler_version,
+      compiler: test_case.compiler || compiler,
+      compiler_version: test_case.compiler_version || compiler_version,
       platform_version: platform_version,
       omp_num_threads: test_case.test_omp_num_threads,
       success_type: test_case.success_type,
@@ -268,7 +270,7 @@ e-mail and password will be stored in plain text.'
     # user gives data about the user and computer submitting information
     # instances is array of hashes that identify test instances (more below)
     res = {
-            version: {number: mesa.version_number},
+            version: {number: mesa.version_number, compiled: mesa.installed?},
             user: {email: email, password: password, computer: computer_name},
             instances: []
           }
@@ -277,6 +279,11 @@ e-mail and password will be stored in plain text.'
       res[:version][:log] = mesa.svn_log
     end
 
+    # bail out if installation failed (and we care)
+    return [res, []] unless res[:version][:compiled]
+
+    # Successfully compiled, now gather test instance data.
+
     # hold on to test case names that fail in synthesizing params
     has_errors = []
 
@@ -380,7 +387,7 @@ e-mail and password will be stored in plain text.'
           unsubmitted_cases << test_name
         end
       end
-      puts "\n Submission results for #{mod} module:"
+      puts "\nSubmission results for #{mod} module:"
       puts '#####################################'
       if !submitted_cases.empty?
         shell.say 'Submitted the following cases:', :green
@@ -418,7 +425,7 @@ e-mail and password will be stored in plain text.'
       initheader = { 'Content-Type' => 'application/json' }
     )
     request_data, error_cases = revision_submit_params(mesa)
-    if request_data[:instances].empty?
+    if request_data[:instances].empty? && mesa.installed?
       shell.say "No completed test data found in #{mesa.mesa_dir}. Aborting.",
                 :red
       return false
@@ -439,8 +446,13 @@ e-mail and password will be stored in plain text.'
       shell.say "\nFailed to gather data for the following cases:", :red
       error_cases.each { |tc| shell.say "  #{tc.test_name}", :red }
       false
+    else
+      shell.say "\nSuccessfully submitted revision #{mesa.version_number}.", :green
+      @last_tested = mesa.version_number
+      shell.say "\n\nUpdating last tested revision to #{last_tested}."
+      save_computer_data
+      true      
     end
-    true
   end
 end
 
@@ -448,7 +460,7 @@ class Mesa
   SVN_URI = 'svn://svn.code.sf.net/p/mesa/code/trunk'.freeze    
 
   attr_reader :mesa_dir, :test_data, :test_names, :test_cases, :shell,
-              :svn_version, :svn_author, :svn_log
+              :svn_version, :svn_author, :svn_log, :using_sdk
   attr_accessor :update_checksums
 
   def self.download(version_number: nil, new_mesa_dir: nil, use_svn: true)
@@ -458,8 +470,9 @@ class Mesa
       "svn://svn.code.sf.net/p/mesa/code/trunk #{new_mesa_dir}"
     )
     unless success
-      raise MesaDirError, 'Encountered a problem in download mesa ' \
-                          "revision #{version_number}."
+      raise MesaDirError, 'Encountered a problem in downloading mesa ' \
+                          "revision #{version_number}. Perhaps svn isn't " \
+                          'working properly?'
     end
     Mesa.new(mesa_dir: new_mesa_dir, use_svn: use_svn)
   end
@@ -510,11 +523,12 @@ class Mesa
     nil
   end
 
-  def initialize(mesa_dir: ENV['MESA_DIR'], use_svn: true)
+  def initialize(mesa_dir: ENV['MESA_DIR'], use_svn: true, using_sdk: false)
     # absolute_path ensures that it doesn't matter where commands are executed
     # from
     @mesa_dir = File.absolute_path(mesa_dir)
     @use_svn = use_svn
+    @using_sdk = using_sdk
     @update_checksums = false
 
     # these get populated by calling #load_test_data
@@ -544,7 +558,7 @@ class Mesa
   end
 
   def log_entry
-    `svn log #{SVN_URI} -r #{version_number}`
+    `svn log #{mesa_dir} -r #{version_number}`
   end
 
   def load_svn_data
@@ -559,7 +573,9 @@ class Mesa
 
   # get version number from svn (preferred method)
   def svn_version_number
-    return `svnversion #{mesa_dir}`.strip.to_i
+    # match output of svn info to a line with the revision, capturing the
+    # number, and defaulting to 0 if none is found.
+    return (/Revision\:\s+(\d+)/.match(`svn info #{mesa_dir}`)[1] || 0).to_i
   rescue Errno::ENOENT
     return 0
   end
@@ -594,9 +610,19 @@ class Mesa
         bash_execute('./install')
       end
     end
+    # this should never happen if visit_and_check works properly.
+    check_installation
     self
   end
 
+  # throw an error unless it seems like it's properly compiled
+  def check_installation
+    unless installed?
+      raise MesaDirError, 'Installation check failed (no .mod files found ' \
+                          'in the last compiled module).'
+    end
+  end    
+
   def destroy
     FileUtils.rm_rf mesa_dir
   end
@@ -694,6 +720,7 @@ class Mesa
   end
 
   def each_test_run_and_diff(mod: :all, log_results: false)
+    check_installation
     each_test_clean(mod: mod)
 
     if mod == :all
@@ -721,10 +748,29 @@ class Mesa
     end
   end
 
-  def installed?
+  def downloaded?
     check_mesa_dir
   end
 
+  def installed?
+    # look for output files in the last-installed module
+    # this isn't perfect, but it's a pretty good indicator of completing
+    # installation
+    install_file = File.join(mesa_dir, 'install')
+    # match last line of things like "do_one SOME_MODULE" or "do_one_parallel 
+    # SOME_MODULE", after which the "SOME_MODULE" will be stored in $1
+    # that is the last module to be compiled by ./install.
+    IO.readlines(install_file).select do |line|
+      line =~ /^\s*do_one\w*\s+\w+/
+    end.last =~ /^\s*do_one\w*\s+(\w+)/
+    # module is "installed" if there is a nonzero number of files in the
+    # module's make directory of the form SOMETHING.mod
+    !Dir.entries(File.join(mesa_dir, $1, 'make')).select do |file|
+      File.extname(file) == '.mod'
+    end.empty?
+  end
+
+
   private
 
   # verify that mesa_dir is valid by checking for version number and test_suite
@@ -847,7 +893,8 @@ class MesaTestCase
   attr_reader :test_name, :mesa_dir, :mesa, :success_string, :final_model,
               :failure_msg, :success_msg, :photo, :runtime_seconds,
               :test_omp_num_threads, :mesa_version, :shell, :mod, :retries,
-              :backups, :steps, :runtime_minutes, :summary_text
+              :backups, :steps, :runtime_minutes, :summary_text, :compiler,
+              :compiler_version
   attr_accessor :data_names, :data_types, :failure_type, :success_type,
                 :outcome
 
@@ -874,13 +921,19 @@ class MesaTestCase
     @backups = 0
     @steps = 0
     @summary_text = ''
+
+    # this overrides the submitters choice if it is non-nil
+    @compiler = mesa.using_sdk ? 'SDK' : nil
+    # only relevant if @compiler is SDK. Gets set during do_one
+    @compiler_version = nil
+
     unless MesaTestCase.modules.include? mod
       raise TestCaseDirError, "Invalid module: #{mod}. Must be one of: " +
                               MesaTestCase.modules.join(', ')
     end
     @mod = mod
     @failure_msg = {
-      run_test_string: "#{test_name} failed: does not match test string",
+      run_test_string: "#{test_name} run failed: does not match test string",
       run_checksum: "#{test_name} run failed: checksum for #{final_model} " \
         'does not match after ./rn',
       run_diff: "#{test_name} run failed: diff #{final_model} " \
@@ -889,7 +942,9 @@ class MesaTestCase
       photo_checksum: "#{test_name} restart failed: checksum for " \
         "#{final_model} does not match after ./re",
       photo_diff: "#{test_name} restart failed: diff #{final_model} " \
-        'final_check.mod after ./re'
+        'final_check.mod after ./re',
+      compilation: "#{test_name} compilation failed"
+
     }
     @success_msg = {
       run_test_string: "#{test_name} run: found test string: " \
@@ -987,6 +1042,14 @@ class MesaTestCase
   # based on $MESA_DIR/star/test_suite/each_test_run_and_diff, revision 10000
   def do_one
     @test_omp_num_threads = omp_num_threads
+    if mesa.using_sdk
+      version_bin = File.join(ENV['MESASDK_ROOT'], 'bin', 'mesasdk_version.sh')
+      # can't use bash_execute because the return value of bash_execute is the
+      # exit status of the commmand (true or false), whereas backticks give the
+      # output (the version string) as the output
+      @compiler_version = `bash -c #{version_bin}`.strip
+      shell.say("Using version #{@compiler_version} of the SDK.", :blue)
+    end
     in_dir do
       FileUtils.touch '.running'
       shell.say("building and running #{test_name}", :blue)
@@ -1017,6 +1080,10 @@ class MesaTestCase
       'steps' => steps,
       'summary_text' => summary_text
     }
+    if compiler == 'SDK'
+      res['compiler'] = 'SDK'
+      res['compiler_version'] = compiler_version
+    end
     File.open(save_file, 'w') { |f| f.write(YAML.dump(res)) }
     shell.say "Successfully saved results to file #{save_file}.\n", :green
   end
@@ -1043,6 +1110,8 @@ class MesaTestCase
     @backups = data['backups'] || @backups
     @steps = data['steps'] || @steps
     @summary_text = data['summary_text'] || @summary_text
+    @compiler = data['compiler'] || @compiler
+    @compiler_version = data['compiler_version'] || @compiler_version
 
     # convert select data to symbols since that is how they are used
     @outcome = @outcome.to_sym if @outcome
@@ -1188,8 +1257,8 @@ class MesaTestCase
     # if this is false, behave like each_test_run_and_diff.  assume
     # the checksum is up-to-date and check it matches after rn and re.
     if @mesa.update_checksums
-      bash_execute("md5sum \"#{final_model}\" > checks.md5")
       puts "md5sum \"#{final_model}\" > checks.md5"
+      bash_execute("md5sum \"#{final_model}\" > checks.md5")
       FileUtils.cp final_model, 'final_check.mod'
 
       # if there's no photo, we won't check the checksum, so we've succeeded
@@ -1243,7 +1312,11 @@ class MesaTestCase
     # first clean and make... Should be compatible with any shell since
     # redirection is always wrapped in 'bash -c "{STUFF}"'
     simple_clean
-    mk
+    begin
+      mk
+    rescue TestCaseDirError
+      return fail_test(:compilation)
+    end
 
     # remove old final model if it exists
     remove_final_model
@@ -1334,7 +1407,7 @@ class MesaTestCase
   end
 
   def get_summary_text
-    lines = IO.readlines(out_file).select do |line|
+    IO.readlines(out_file).select do |line|
       line =~ /^\s*runtime/ 
     end.join
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.1.2
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Command line tool for running and reporting the MESA test suites.