summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorThanh Ha <thanh.ha@linuxfoundation.org>2016-12-19 21:55:35 +0000
committerGerrit Code Review <gerrit@fd.io>2016-12-19 21:55:35 +0000
commit0be40a9d0b67e53e20ec9b8ba77407f7696e881f (patch)
tree0e1a8d004c4cf434134d23a436260843002b4879 /jjb
parent4bbc40d0848f1ac62ce2f95bab3ef1b0d08acb3e (diff)
parent68f5cfb09a6fdd793450e551db19a24cde8c7c2f (diff)
Merge "Revert "Add dependencies for tldk jjb""
Diffstat (limited to 'jjb')
-rw-r--r--jjb/tldk/gtest-build.sh13
-rw-r--r--jjb/tldk/include-raw-build.sh8
-rw-r--r--jjb/tldk/tldk.yaml8
3 files changed, 0 insertions, 29 deletions
diff --git a/jjb/tldk/gtest-build.sh b/jjb/tldk/gtest-build.sh
deleted file mode 100644
index dc66908e7..000000000
--- 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 417a1deca..f4ba63b63 100644
--- 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 b37581ce6..b8e6e821f 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -109,10 +109,6 @@
builders:
- shell:
- !include-raw-escape: gtest-build.sh
- - inject:
- properties-file: gtest-env.prop
- - shell:
!include-raw-escape: include-raw-build.sh
- job-template:
@@ -152,8 +148,4 @@
builders:
- shell:
- !include-raw-escape: gtest-build.sh
- - inject:
- properties-file: gtest-env.prop
- - shell:
!include-raw-escape: include-raw-build.sh