Merge "Revert "Add dependencies for tldk jjb""

diff --git a/jjb/tldk/gtest-build.sh b/jjb/tldk/gtest-build.sh
deleted file mode 100644 (file)
index dc66908..0000000
--- a/jjb/tldk/gtest-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# basic build script example
-set -e -o pipefail
-set -x
-echo $WORKSPACE
-git clone https://github.com/google/googletest.git $WORKSPACE/googletest
-cmake $WORKSPACE/googletest/CMakeLists.txt
-echo GTEST_DIR=$WORKSPACE/googletest/googletest > gtest-env.prop
-echo GMOCK_DIR=$WORKSPACE/googletest/googlemock >> gtest-env.prop
-
-echo "*******************************************************************"
-echo "* GTEST BUILD SUCCESSFULLY COMPLETED"
-echo "*******************************************************************"

diff --git a/jjb/tldk/include-raw-build.sh b/jjb/tldk/include-raw-build.sh
index 417a1de..f4ba63b 100644 (file)
--- a/jjb/tldk/include-raw-build.sh
+++ b/jjb/tldk/include-raw-build.sh
@@ -28,16 +28,8 @@ fi
 echo "sha1sum of this script: ${0}"
 sha1sum $0
 
-# Make TLDK
 make
 
 echo "*******************************************************************"
 echo "* TLDK BUILD SUCCESSFULLY COMPLETED"
 echo "*******************************************************************"
-
-# Run unit tests application
-$WORKSPACE/x86_64-native-linuxapp-gcc/app/gtest-rfc --lcores=0 -n 2
-
-echo "*******************************************************************"
-echo "* TLDK UNIT TESTS SUCCESSFUL
-echo "*******************************************************************"

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index b37581c..b8e6e82 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -108,10 +108,6 @@
                 notbuilt: true
 
     builders:
-        - shell:
-            !include-raw-escape: gtest-build.sh
-        - inject:
-            properties-file: gtest-env.prop
         - shell:
             !include-raw-escape: include-raw-build.sh
 
@@ -151,9 +147,5 @@
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: gtest-build.sh
-        - inject:
-            properties-file: gtest-env.prop
         - shell:
             !include-raw-escape: include-raw-build.sh