From 368cca2cd6e448875e0e2457414d264dd9578d45 Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Mon, 5 Aug 2019 18:50:30 +0000
Subject: [PATCH] Clean up scripts and update golds
---
basice2e/clients.goldoutput/client18.out | 1 +
basice2e/clients.goldoutput/client9.out | 1 +
build.sh | 1 +
update.sh | 57 ++++--------------------
4 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/basice2e/clients.goldoutput/client18.out b/basice2e/clients.goldoutput/client18.out
index 5b11217..6c5b3a1 100644
--- a/basice2e/clients.goldoutput/client18.out
+++ b/basice2e/clients.goldoutput/client18.out
@@ -1 +1,2 @@
Received: Hello, 18, with E2E Encryption
+Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client9.out b/basice2e/clients.goldoutput/client9.out
index 71a5485..3206400 100644
--- a/basice2e/clients.goldoutput/client9.out
+++ b/basice2e/clients.goldoutput/client9.out
@@ -1 +1,2 @@
Received: Hello, 9, with E2E Encryption
+Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
diff --git a/build.sh b/build.sh
index f131349..8ad2cba 100755
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,7 @@
# and assumes that you've cloned the Go repos to your GOPATH and updated them
# with Glide.
+set -x
mkdir -p bin
pushd bin
go build gitlab.com/elixxir/client
diff --git a/update.sh b/update.sh
index 53d9690..08b006b 100755
--- a/update.sh
+++ b/update.sh
@@ -3,59 +3,18 @@
# This intended for updating the tested repos and their dependencies to the
# latest versions before running the integration test.
-git pull
-rm -fr ~/.glide
-
update() {
git stash
git clean -ffdx
git checkout master
git pull
- glide cc
- glide up
+ glide cc && glide up
}
-pushd $GOPATH/src/gitlab.com/elixxir/client
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/server
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/channelbot
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/user-discovery-bot
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/gateway
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/comms
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/crypto
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/client-consoleUI
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/primitives
-update
-popd
-
-pushd $GOPATH/src/gitlab.com/elixxir/registration
-update
-popd
-
-pushd ..
-go test ./...
-popd
-
+for DIR in client server gateway user-discovery-bot registration; do
+ echo $DIR
+ pushd $GOPATH/src/gitlab.com/elixxir/client
+ update
+ go test ./...
+ popd
+done
--
GitLab