From 393d893ef7505368d0fec5bdae3f21d68756008f Mon Sep 17 00:00:00 2001
From: Radu Ioan Fericean <radu@fericean.ro>
Date: Fri, 25 Mar 2016 15:11:02 +0200
Subject: [PATCH] make tests use glide novendor

---
 .travis.yml   |  2 +-
 local_test.sh | 31 ++-----------------------------
 test.sh       | 50 ++------------------------------------------------
 3 files changed, 5 insertions(+), 78 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 899b7c359..9b4f37383 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ install:
   - go get github.com/Masterminds/glide
   - glide install
 
-script: $TRAVIS_BUILD_DIR/test.sh
+script: go test -v $(glide novendor)
 
 branches:
   only: master
diff --git a/local_test.sh b/local_test.sh
index 05577d629..4218bd3bd 100755
--- a/local_test.sh
+++ b/local_test.sh
@@ -1,32 +1,5 @@
 #! /usr/bin/env sh
 ./test.sh
 gen=$?
-echo 'go test github.com/cgrates/cgrates/apier/v1 -local'
-go test github.com/cgrates/cgrates/apier/v1 -local
-ap1=$?
-echo 'go test github.com/cgrates/cgrates/apier/v2 -local'
-go test github.com/cgrates/cgrates/apier/v2 -local
-ap2=$?
-echo 'go test github.com/cgrates/cgrates/engine -local -integration'
-go test github.com/cgrates/cgrates/engine -local -integration
-en=$?
-echo 'go test github.com/cgrates/cgrates/cdrc -local'
-go test github.com/cgrates/cgrates/cdrc -local
-cdrc=$?
-echo 'go test github.com/cgrates/cgrates/config -local'
-go test github.com/cgrates/cgrates/config -local
-cfg=$?
-echo 'go test github.com/cgrates/cgrates/utils -local'
-go test github.com/cgrates/cgrates/utils -local
-utl=$?
-echo 'go test github.com/cgrates/cgrates/general_tests -local -integration'
-go test github.com/cgrates/cgrates/general_tests -local -integration
-gnr=$?
-echo 'go test github.com/cgrates/cgrates/agents -integration'
-go test github.com/cgrates/cgrates/agents -integration
-agts=$?
-echo 'go test github.com/cgrates/cgrates/sessionmanager -integration'
-go test github.com/cgrates/cgrates/sessionmanager -integration
-smg=$?
-
-exit $gen && $ap1 && $ap2 && $en && $cdrc && $cfg && $utl && $gnr && $agts && $smg
+go test -local -integration $(glide novendor)
+exit $gen && $?
diff --git a/test.sh b/test.sh
index 3a4a57e95..8c6ab0558 100755
--- a/test.sh
+++ b/test.sh
@@ -1,50 +1,4 @@
 #! /usr/bin/env sh
 ./build.sh
-
-go test -i github.com/cgrates/cgrates/apier/v1
-go test -i github.com/cgrates/cgrates/apier/v2
-go test -i github.com/cgrates/cgrates/engine
-go test -i github.com/cgrates/cgrates/sessionmanager
-go test -i github.com/cgrates/cgrates/config
-go test -i github.com/cgrates/cgrates/cmd/cgr-engine
-go test -i github.com/cgrates/cgrates/cache2go
-go test -i github.com/cgrates/cgrates/cdrc
-go test -i github.com/cgrates/cgrates/utils
-go test -i github.com/cgrates/cgrates/history
-go test -i github.com/cgrates/cgrates/cdre
-go test -i github.com/cgrates/cgrates/agents
-go test -i github.com/cgrates/cgrates/structmatcher
-
-go test github.com/cgrates/cgrates/apier/v1
-v1=$?
-go test github.com/cgrates/cgrates/apier/v2
-v2=$?
-go test github.com/cgrates/cgrates/engine
-en=$?
-go test github.com/cgrates/cgrates/general_tests
-gt=$?
-go test github.com/cgrates/cgrates/sessionmanager
-sm=$?
-go test github.com/cgrates/cgrates/config
-cfg=$?
-go test github.com/cgrates/cgrates/cmd/cgr-engine
-cr=$?
-go test github.com/cgrates/cgrates/console
-con=$?
-go test github.com/cgrates/cgrates/cdrc
-cdrcs=$?
-go test github.com/cgrates/cgrates/utils
-ut=$?
-go test github.com/cgrates/cgrates/history
-hs=$?
-go test github.com/cgrates/cgrates/cache2go
-c2g=$?
-go test github.com/cgrates/cgrates/cdre
-cdre=$?
-go test github.com/cgrates/cgrates/agents
-ag=$?
-go test github.com/cgrates/cgrates/structmatcher
-sc=$?
-
-
-exit $v1 && $v2 && $en && $gt && $sm && $cfg && $bl && $cr && $con && $cdrc && $ut && $hs && $c2g && $cdre && $ag && $sc
+go test $(glide novendor)
+exit $?