Merge pull request nfrechette#16 from CodyDWJones/feature-choose-tests

Use the argparse module, upgrade Catch2, allow running of specific unit tests

Author: nfrechette

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/catch2"]
+	path = external/catch2
+	url = https://github.com/catchorg/Catch2

.travis.yml

@@ -64,17 +64,17 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true ; fi
 
 script:
-    - python3 make.py -clean -build -unit_test -${COMPILER} -Debug -x86
-    - python3 make.py -clean -build -unit_test -${COMPILER} -Release -x86
-    - python3 make.py -clean -build -unit_test -${COMPILER} -Debug -x64
-    - python3 make.py -clean -build -unit_test -${COMPILER} -Release -x64
+    - python3 make.py -clean -build -unit_test -compiler ${COMPILER} -config Debug -cpu x86
+    - python3 make.py -clean -build -unit_test -compiler ${COMPILER} -config Release -cpu x86
+    - python3 make.py -clean -build -unit_test -compiler ${COMPILER} -config Debug -cpu x64
+    - python3 make.py -clean -build -unit_test -compiler ${COMPILER} -config Release -cpu x64
     - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      python3 make.py -clean -build -ios -Debug;
-      python3 make.py -clean -build -ios -Release;
+      python3 make.py -clean -build -compiler ios -config Debug;
+      python3 make.py -clean -build -compiler ios -config Release;
       fi'
     # Only run sonarcloud on non-PRs
     - 'if [[ "$SONARCLOUD" == "1" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
-      python3 make.py -clean -${COMPILER} -Release -x64;
-      build-wrapper-linux-x86-64 --out-dir bw_output python3 make.py -build -${COMPILER} -Release -x64;
+      python3 make.py -clean -compiler ${COMPILER} -config Release -cpu x64;
+      build-wrapper-linux-x86-64 --out-dir bw_output python3 make.py -build -compiler ${COMPILER} -config Release -cpu x64;
       sonar-scanner;
       fi'

appveyor.yml

@@ -7,14 +7,18 @@ image:
 - Visual Studio 2015
 - Visual Studio 2017
 
+install:
+- cmd: >-
+    git submodule update --init --recursive
+
 build_script:
 - cmd: >-
     IF "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (SET COMPILER=vs2015) ELSE (SET COMPILER=vs2017)
 
-    %PYTHON%\\python.exe make.py -clean -build -unit_test -%COMPILER% -Debug -x86
+    %PYTHON%\\python.exe make.py -clean -build -unit_test -compiler %COMPILER% -config Debug -cpu x86
 
-    %PYTHON%\\python.exe make.py -clean -build -unit_test -%COMPILER% -Release -x86
+    %PYTHON%\\python.exe make.py -clean -build -unit_test -compiler %COMPILER% -config Release -cpu x86
 
-    %PYTHON%\\python.exe make.py -clean -build -unit_test -%COMPILER% -Debug -x64
+    %PYTHON%\\python.exe make.py -clean -build -unit_test -compiler %COMPILER% -config Debug -cpu x64
 
-    %PYTHON%\\python.exe make.py -clean -build -unit_test -%COMPILER% -Release -x64
+    %PYTHON%\\python.exe make.py -clean -build -unit_test -compiler %COMPILER% -config Release -cpu x64

external/README.md

@@ -4,4 +4,4 @@ Good news! There are no external dependencies needed by this library at runtime!
 
 ## Catch
 
-[Catch 1.9.6](https://github.com/catchorg/Catch2/releases/tag/v1.9.6) is used by our [unit tests](../tests). You will only need it if you run the unit tests and it is included as-is without modifications.
+[Catch2 v2.5.0](https://github.com/catchorg/Catch2/releases/tag/v2.5.0) is used by our [unit tests](../tests). You will only need it if you run the unit tests and it is included as-is without modifications.