commit fedf845bdb7b4b0a2e1af97fd1101b60e0602305
author Artemy Kovalyov <artemyko@mellanox.com> Mon May 02 17:12:20 2016 +0300
committer Artemy Kovalyov <artemyko@mellanox.com> Mon May 02 17:12:20 2016 +0300
tree c9e3539e7757f115ced1fde6cce2c7f6118f0484
parent 74081bbf7e3c097bde9ef0d87bcbdc17150482ae

BUILD: polish jenkins test script

test always should run - removing check for JENKINS_RUN_TESTS
set compilation flags ensure make will take proper libraries

contrib/test_jenkins.sh

diff --git a/contrib/test_jenkins.sh b/contrib/test_jenkins.sh
index bd2b8ae..eb4cbac 100755
--- a/contrib/test_jenkins.sh
+++ b/contrib/test_jenkins.sh
@@ -5,12 +5,8 @@
 if [ -z "$BUILD_NUMBER" ]; then
     echo Running interactive
     WORKSPACE=$PWD
-    BUILD_NUMBER=1
-    WS_URL=file://$WORKSPACE
-    JENKINS_RUN_TESTS=yes
 else
     echo Running under jenkins
-    WS_URL=$JOB_URL/ws
 fi
 
 make_opt="-j$(($(nproc) - 1))"
@@ -23,31 +19,26 @@
 ./autogen.sh
 
 echo "Build release"
-./configure --prefix=$inst
+./configure --prefix=$inst LDFLAGS=-L$inst/lib CPPFLAGS=-I$inst/include
 make $make_opt install
 
-if [ -n "$JENKINS_RUN_TESTS" ]; then
-    # Set CPU affinity to 2 cores, for performance tests
-    if [ -n "$EXECUTOR_NUMBER" ]; then
-        AFFINITY="taskset -c $(( 2 * EXECUTOR_NUMBER ))","$(( 2 * EXECUTOR_NUMBER + 1))"
-        TIMEOUT="timeout 40m"
-    else
-        AFFINITY=""
-        TIMEOUT=""
-    fi
-
-
-    VALGRIND_ARGS="--show-reachable=yes --xml=yes --gen-suppressions=all --tool=memcheck --leak-check=full --track-origins=yes --fair-sched=try"
-
-    for dev in $(ibstat -l); do
-        env IBV_TEST_DEV=${dev} $AFFINITY $ibv_test
-        module load tools/valgrind
-        env IBV_TEST_DEV=${dev} $AFFINITY valgrind $VALGRIND_ARGS --xml-file=$WORKSPACE/${dev}_valgrind.xml --log-file=$WORKSPACE/${dev}_valgrind.txt $ibv_test
-        module unload tools/valgrind
-    done
-
-
+# Set CPU affinity to 2 cores, for performance tests
+if [ -n "$EXECUTOR_NUMBER" ]; then
+    AFFINITY="taskset -c $(( 2 * EXECUTOR_NUMBER ))","$(( 2 * EXECUTOR_NUMBER + 1))"
+    TIMEOUT="timeout 40m"
+else
+    AFFINITY=""
+    TIMEOUT=""
 fi
 
 
+VALGRIND_ARGS="--show-reachable=yes --xml=yes --gen-suppressions=all --tool=memcheck --leak-check=full --track-origins=yes --fair-sched=try"
+
+for dev in $(ibstat -l); do
+    env IBV_TEST_DEV=${dev} $AFFINITY $ibv_test
+    module load tools/valgrind
+    env IBV_TEST_DEV=${dev} $AFFINITY valgrind $VALGRIND_ARGS --xml-file=$WORKSPACE/${dev}_valgrind.xml --log-file=$WORKSPACE/${dev}_valgrind.txt $ibv_test
+    module unload tools/valgrind
+done
+
 exit $rc