Fix merge issues

This commit is contained in:
DanB
2016-03-25 17:11:38 +01:00
46 changed files with 901 additions and 160 deletions

48
test.sh
View File

@@ -1,48 +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/general_tests
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 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=$?
exit $v1 && $v2 && $en && $gt && $sm && $cfg && $bl && $cr && $con && $cdrc && $ut && $hs && $c2g && $cdre && $ag
go test $(glide novendor)
exit $?