updates for client 1.4

Author: munderseth

.travis.yml

@@ -4,24 +4,20 @@ language:
 before_install:
 # Install system prerequisites
  - sudo pip install gcovr
- - ./testspace_install.sh
- - export PATH="${HOME}/testspace:${PATH}"
 
 # Install Google Test framework  
- - wget https://googletest.googlecode.com/files/gtest-1.7.0.zip
- - unzip gtest-1.7.0.zip 
- - mv gtest-1.7.0 gtest
+ - wget https://github.com/google/googletest/archive/release-1.7.0.zip
+ - unzip release-1.7.0.zip 
+ - mv googletest-release-1.7.0 gtest
  - cd gtest
  - mkdir build
  - cd build
  - cmake -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
  - make clean gtest 
 
 script:
-# Build the Google Test samples
  - cd $TRAVIS_BUILD_DIR/gtest/build
  - make  
-# Execute all of the sample test cases; generate coverage
  - ./sample1_unittest --gtest_output=xml:sample1.xml
  - ./sample2_unittest --gtest_output=xml:sample2.xml
  - ./sample3_unittest --gtest_output=xml:sample3.xml
@@ -35,6 +31,7 @@ script:
  - cd ..
  - gcovr --root $PWD --filter ".*/samples.*" --exclude ".*_unittest.*" -x -o build/coverage.xml
 
-# Publish Test Results along with Coverage
- - cd $TRAVIS_BUILD_DIR/gtest/build
- - testspace publish [Tests]sample*.xml coverage.xml ${TESTSPACE_URL}
+after_script:  
+  - curl -s https://testspace-client.s3.amazonaws.com/testspace-linux.tgz | sudo tar -zxvf- -C /usr/local/bin
+  - cd $TRAVIS_BUILD_DIR/gtest/build
+  - testspace [Tests]sample*.xml coverage.xml $TESTSPACE_TOKEN/${TRAVIS_BRANCH}#travis.Build.${TRAVIS_BUILD_NUMBER}

shippable.yml

@@ -2,17 +2,37 @@
 
  env:
    global:
-    - secure: JWduGQinMmKxrpRs7XT27ugRParfmC/sV/DHmnI71Wrb+2u297YMvIgNXlSgqfqBOZNCfhB8IhxnzfjP7eGkM3k/hC1qyEYxZdx5aYBu+F2juqXBfKgNEjDn/i3m5czsXce0yb20KMQWJ0BP75jb0jeaZCK6dF7ihclTmYXCeMdDaeA7I9yLB9J6Q1GUGMOPbJ7oL+6G8u97SfqacN8A4nzajzgCkB9V8zZqHVF6PnWuvP5KLKUWc24pc1vfEx/E+MkaNbPTAOvcG4H2i+SAO1Q37Ch9qcmRvgJ2ddlQYWJglZ2eJF7YlgCtqXzGE85R6wWiuoPliDbcit0o9mGH2A==
+    - secure: Guv8JrTD70i5/YZQJxIJH/lcSsezkbwiEy/ePcMm2grd3I08XlGMXRCod+IjMHqVe3Tv8X4CPOgebCcluCjmHjV2110JfohGLNgZK99VTxDqYrfCJNtXxwwr8iQmliqPCCl+EDlzZ7Mx0Tqr8uBAWOkHTXYwRqUdElUY4WHjj8WDYIYaG/Nc8u4Ev7r4byydSfIBYOeu5bmxuXPDECgtv3Bv6iiRaPT9WfQ6xpgr5JiHzlrBOtMQul5CbduLxwz2J6heeIHpepvBvbLnwXfYlyjMVlLUTTsf+JoBtil8c8mO7tOeR1QqpM6HWYNdxMlornhFTC+IDltY3Iuf6SgSAg==
 
  before_script:
-   - ./testspace_install.sh
-   - export PATH="${HOME}/testspace:${PATH}"
-   - mkdir -p shippable/codecoverage
-   - mkdir -p shippable/testresults
-    
+  - sudo pip install gcovr
+  - wget https://github.com/google/googletest/archive/release-1.7.0.zip
+  - unzip release-1.7.0.zip 
+  - mv googletest-release-1.7.0 gtest
+  - cd gtest
+  - mkdir build
+  - cd build
+  - cmake -Dgtest_build_samples=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG='-g -fprofile-arcs -ftest-coverage' ../
+  - make clean gtest 
+ 
  script: 
-   - testspace import .testspace.xml ${TESTSPACE_URL}
-   - testspace run ${TESTSPACE_URL}
-   
-   - cp gtest/build/sample*.xml shippable/testresults
-   - cp gtest/build/coverage.xml shippable/codecoverage
+  - make
+  - ./sample1_unittest --gtest_output=xml:sample1.xml
+ - ./sample2_unittest --gtest_output=xml:sample2.xml
+ - ./sample3_unittest --gtest_output=xml:sample3.xml
+ - ./sample4_unittest --gtest_output=xml:sample4.xml
+ - ./sample5_unittest --gtest_output=xml:sample5.xml
+ - ./sample6_unittest --gtest_output=xml:sample6.xml
+ - ./sample7_unittest --gtest_output=xml:sample7.xml
+ - ./sample8_unittest --gtest_output=xml:sample8.xml
+ - ./sample9_unittest --gtest_output=xml:sample9.xml
+ - ./sample10_unittest --gtest_output=xml:sample10.xml
+ - cd ..
+ - gcovr --root $PWD --filter ".*/samples.*" --exclude ".*_unittest.*" -x -o build/coverage.xml
+ 
+ after_script: 
+  - curl -s https://testspace-client.s3.amazonaws.com/testspace-linux.tgz | sudo tar -zxvf- -C /usr/local/bin
+  - cd build
+  - testspace [Tests]sample*.xml coverage.xml $TESTSPACE_TOKEN/${BRANCH}#ship.Build.${BUILD_NUMBER}
+
+