This is an automated email from the ASF dual-hosted git repository.
mark4z pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu-samples.git
The following commit(s) were added to refs/heads/main by this push:
new 237e510 prepare before integrate test; turn on CGO (#8)
237e510 is described below
commit 237e510218388b18b390fe168a8aad3ea44058e9
Author: ma642 <[email protected]>
AuthorDate: Thu Oct 27 11:01:16 2022 +0800
prepare before integrate test; turn on CGO (#8)
Co-authored-by: mazhihui <[email protected]>
---
igt/Makefile | 1 +
integrate_test.sh | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/igt/Makefile b/igt/Makefile
index e014efc..7110193 100644
--- a/igt/Makefile
+++ b/igt/Makefile
@@ -147,6 +147,7 @@ run: buildPixiu
## buildPixiu: start pixiu
.PHONY: buildPixiu
buildPixiu:
+ @echo "buildPixiu CGO=$(CGO)"
@CGO_ENABLED=$(CGO) GOOS=$(GOOS) GOARCH=$(GOARCH) go build $(GCFLAGS)
-ldflags=$(LDFLAGS) -o $(OUT_DIR)/dubbo-go-pixiu$(EXT_NAME) $(pixiuSources)
@-$(OUT_DIR)/dubbo-go-pixiu$(EXT_NAME) gateway start -a
$(API_CONFIG_PATH) -c $(CONFIG_PATH) & echo $$! > $(PIXIU_PID)
@cat $(PIXIU_PID) | sed "/^/s/^/ \> PIXIU_PID: /"
diff --git a/integrate_test.sh b/integrate_test.sh
index 89db50d..e38b014 100755
--- a/integrate_test.sh
+++ b/integrate_test.sh
@@ -22,6 +22,9 @@ fi
P_DIR=$(pwd)/$1
PIXIU_DIR=$(pwd)
+# prepare
+make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f igt/Makefile prepare
+
make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f igt/Makefile docker-up
sleep 2
# test
@@ -31,7 +34,7 @@ make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR
PROJECT_NAME=$(basename $P_DIR) BAS
make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f igt/Makefile start
sleep 2
# start pixiu
-make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f igt/Makefile buildPixiu
+make CGO=on PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename
$P_DIR) BASE_DIR=$P_DIR/dist -f igt/Makefile buildPixiu
sleep 2
# start integration
make PROJECT_DIR=$P_DIR PIXIU_DIR=$PIXIU_DIR PROJECT_NAME=$(basename $P_DIR)
BASE_DIR=$P_DIR/dist -f igt/Makefile integration