From 13381ffa43429c85835f0eeaca5517e0d20117da Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Wed, 20 May 2015 15:04:04 -0600
Subject: [PATCH] Add test, tweak coverage reporting

---
 .travis.yml    |  5 +----
 CMakeLists.txt | 13 +++++++++++++
 src/main.cpp   |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc3b2ad4..823eef15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,7 @@ script:
   - cmake -D ENABLE_COVERAGE:BOOL=TRUE -D CMAKE_BUILD_TYPE:STRING=Debug .
   - make -j2
   - make test
-  - mkdir gcov
-  - find CMakeFiles/ -name "*.gc*" -exec mv {} gcov/ \;
-  - $GCOV -d -o gcov gcov/*.gcda
-  - coveralls -n -E ".*\.cpp"
+  - coveralls -n -E ".*\.cpp" -E "catch\.hpp" --gcov $GCOV
 after_script:
   - contrib/codeanalysis/runcppcheck.sh
 notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cb63dd4..fb0af878 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,6 +314,19 @@ if(BUILD_TESTING)
     "CHAI_MODULE_PATH=${CMAKE_CURRENT_BINARY_DIR}/"
   )
 
+  add_test(version_check_2 chai --version )
+  set_property(TEST version_check_2
+    PROPERTY ENVIRONMENT
+    "CHAI_MODULE_PATH=${CMAKE_CURRENT_BINARY_DIR}/"
+    PROPERTY PASS_REGULAR_EXPRESSION "${CHAI_VERSION}"
+  )
+
+  add_test(help chai --help )
+  set_property(TEST help
+    PROPERTY ENVIRONMENT
+    "CHAI_MODULE_PATH=${CMAKE_CURRENT_BINARY_DIR}/"
+  )
+
 
   foreach(filename ${UNIT_TESTS})
     message(STATUS "Adding test ${filename}")
diff --git a/src/main.cpp b/src/main.cpp
index 3a72df1b..67725f08 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -324,7 +324,7 @@ int main(int argc, char *argv[])
         arg += line + '\n' ;
       }
     } else if ( arg == "-v" || arg == "--version" ) {
-      arg = "version()" ;
+      arg = "print(version())" ;
     } else if ( arg == "-h" || arg == "--help" ) {
       arg = "help(-1)";
     } else if ( arg == "-i" || arg == "--interactive" ) {