|
Jan Chaloupka |
42b318 |
From a144093e502d4529d598ecf997fea9e261ac595d Mon Sep 17 00:00:00 2001
|
|
Jan Chaloupka |
42b318 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
Jan Chaloupka |
42b318 |
Date: Mon, 15 Aug 2016 16:09:52 +0200
|
|
Jan Chaloupka |
42b318 |
Subject: [PATCH] hack test
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
---
|
|
Jan Chaloupka |
42b318 |
test | 26 +++++++++++++-------------
|
|
Jan Chaloupka |
42b318 |
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
diff --git a/test b/test
|
|
Jan Chaloupka |
42b318 |
index 4f24606..deaa527 100755
|
|
Jan Chaloupka |
42b318 |
--- a/test
|
|
Jan Chaloupka |
42b318 |
+++ b/test
|
|
Jan Chaloupka |
42b318 |
@@ -53,7 +53,7 @@ fi
|
|
Jan Chaloupka |
42b318 |
function unit_tests {
|
|
Jan Chaloupka |
42b318 |
echo "Running tests..."
|
|
Jan Chaloupka |
42b318 |
# only -run=Test so examples can run in integration tests
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 3m ${COVER} ${RACE} -cpu 1,2,4 -run=Test $@ ${TEST}
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 3m ${COVER} ${RACE} -cpu 1,2,4 -run=Test $@ ${TEST}
|
|
Jan Chaloupka |
42b318 |
}
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
function integration_tests {
|
|
Jan Chaloupka |
42b318 |
@@ -69,16 +69,16 @@ function integration_tests {
|
|
Jan Chaloupka |
42b318 |
mv /tmp/etcd ./bin/etcd-last-release
|
|
Jan Chaloupka |
42b318 |
fi;
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e &
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 10m -v -cpu 1,2,4 $@ ${REPO_PATH}/e2e &
|
|
Jan Chaloupka |
42b318 |
e2epid="$!"
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration &
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 15m -v -cpu 1,2,4 $@ ${REPO_PATH}/integration &
|
|
Jan Chaloupka |
42b318 |
intpid="$!"
|
|
Jan Chaloupka |
42b318 |
wait $e2epid
|
|
Jan Chaloupka |
42b318 |
wait $intpid
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 1m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/client/integration
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 1m -v -cpu 1,2,4 $@ ${REPO_PATH}/contrib/raftexample
|
|
Jan Chaloupka |
42b318 |
- go test -timeout 1m -v ${RACE} -cpu 1,2,4 -run=Example $@ ${TEST}
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 1m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/client/integration
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 10m -v ${RACE} -cpu 1,2,4 $@ ${REPO_PATH}/clientv3/integration
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 1m -v -cpu 1,2,4 $@ ${REPO_PATH}/contrib/raftexample
|
|
Jan Chaloupka |
42b318 |
+ ${GOTEST:-go test} -timeout 1m -v ${RACE} -cpu 1,2,4 -run=Example $@ ${TEST}
|
|
Jan Chaloupka |
42b318 |
}
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
function fmt_tests {
|
|
Jan Chaloupka |
42b318 |
@@ -197,18 +197,18 @@ function dep_tests {
|
|
Jan Chaloupka |
42b318 |
}
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
# Set up gopath so tests use vendored dependencies
|
|
Jan Chaloupka |
42b318 |
-export GOPATH=${PWD}/gopath
|
|
Jan Chaloupka |
42b318 |
-rm -rf $GOPATH/src
|
|
Jan Chaloupka |
42b318 |
-mkdir -p $GOPATH
|
|
Jan Chaloupka |
42b318 |
-ln -s ${PWD}/cmd/vendor $GOPATH/src
|
|
Jan Chaloupka |
42b318 |
+#export GOPATH=${PWD}/Godeps/_workspace
|
|
Jan Chaloupka |
42b318 |
+#rm -rf $GOPATH/src
|
|
Jan Chaloupka |
42b318 |
+#mkdir -p $GOPATH
|
|
Jan Chaloupka |
42b318 |
+#ln -s ${PWD}/cmd/vendor $GOPATH/src
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
# fail fast on static tests
|
|
Jan Chaloupka |
42b318 |
toggle_failpoints disable
|
|
Jan Chaloupka |
42b318 |
-fmt_tests
|
|
Jan Chaloupka |
42b318 |
+#fmt_tests
|
|
Jan Chaloupka |
42b318 |
dep_tests
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
# fail fast on static tests
|
|
Jan Chaloupka |
42b318 |
-GO_BUILD_FLAGS="-a -v" etcd_build
|
|
Jan Chaloupka |
42b318 |
+#GO_BUILD_FLAGS="-a -v" etcd_build
|
|
Jan Chaloupka |
42b318 |
|
|
Jan Chaloupka |
42b318 |
unit_tests
|
|
Jan Chaloupka |
42b318 |
if [ -n "$INTEGRATION" ]; then
|
|
Jan Chaloupka |
42b318 |
--
|
|
Jan Chaloupka |
42b318 |
1.9.3
|
|
Jan Chaloupka |
42b318 |
|