fixup! Add all-in-debug-mode target in Makefile

godwokenrises · Aug 5, 2021 · 363e83e · 363e83e
1 parent e4fa3ac
commit 363e83e
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -17,10 +17,10 @@ CFLAGS_MBEDTLS := -Ideps/mbedtls/include
 CFLAGS_EVMONE := -Ideps/evmone/lib/evmone -Ideps/evmone/include -Ideps/evmone/evmc/include
 CFLAGS_SMT := -Ideps/godwoken-scripts/c/deps/sparse-merkle-tree/c
 CFLAGS_GODWOKEN := -Ideps/godwoken-scripts/c
-CFLAGS := -O3 -Ic/ripemd160 $(CFLAGS_CKB_STD) $(CFLAGS_EVMONE) $(CFLAGS_INTX) $(CFLAGS_BN128) $(CFLAGS_ETHASH) $(CFLAGS_CRYPTO_ALGORITHMS) $(CFLAGS_MBEDTLS) $(CFLAGS_SMT) $(CFLAGS_GODWOKEN) $(CFLAGS_SECP) -Wall -fdata-sections -ffunction-sections
+CFLAGS := -O3 -Ic/ripemd160 $(CFLAGS_CKB_STD) $(CFLAGS_EVMONE) $(CFLAGS_INTX) $(CFLAGS_BN128) $(CFLAGS_ETHASH) $(CFLAGS_CRYPTO_ALGORITHMS) $(CFLAGS_MBEDTLS) $(CFLAGS_SMT) $(CFLAGS_GODWOKEN) $(CFLAGS_SECP)
 CXXFLAGS := $(CFLAGS) -std=c++1z
 # -Wl,<args> Pass the comma separated arguments in args to the linker(GNU linker)
-LDFLAGS := -Wl,--gc-sections
+LDFLAGS := -Wl,--gc-sections -Wall -fdata-sections -ffunction-sections
 
 SECP256K1_SRC := $(SECP_DIR)/src/ecmult_static_pre_context.h
 
@@ -44,8 +44,7 @@ all-via-docker: generate-protocol
 	docker run --rm -v `pwd`:/code ${BUILDER_DOCKER} bash -c "cd /code && make"
 
 # Be aware that a given prerequisite will only be built once per invocation of make, at most.
-all-in-debug-mode: CFLAGS += -g
-all-in-debug-mode: CXXFLAGS += -g
+all-in-debug-mode: LDFLAGS := -g
 all-in-debug-mode: $(ALL_OBJS) build/generator_log build/validator_log
 
 all-via-docker-in-debug-mode: generate-protocol

diff --git a/devtools/ci/integration-test.sh b/devtools/ci/integration-test.sh
@@ -13,12 +13,13 @@ if [ -d "$GODWOKEN_DIR" ]
 then
     echo "godwoken project already exists"
 else
-    git clone --depth=1 https://github.com/nervosnetwork/godwoken.git $GODWOKEN_DIR
+    # git clone --depth=1 https://github.com/nervosnetwork/godwoken.git $GODWOKEN_DIR
+    git clone -b pprof --depth=1 https://github.com/Flouse/godwoken.git $GODWOKEN_DIR
 fi
 
 cd $GODWOKEN_DIR
-git fetch origin --tags
-git checkout v0.6.0-rc3
+# git fetch origin --tags
+# git checkout v0.6.0-rc3
 git submodule update --init --recursive
 
 cd tests-deps/godwoken-scripts/c
@@ -34,3 +35,7 @@ cd $TESTS_DIR
 export RUST_BACKTRACE=full
 cargo test -- --nocapture
 cargo bench | egrep -v debug
+
+cd $PROJECT_ROOT
+make clean-via-docker  
+make all-via-docker-in-debug-mode
diff --git a/polyjuice-tests/.vscode/settings.json b/polyjuice-tests/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "files.insertFinalNewline": false
+}
diff --git a/polyjuice-tests/Cargo.lock b/polyjuice-tests/Cargo.lock
diff --git a/polyjuice-tests/Cargo.toml b/polyjuice-tests/Cargo.toml
@@ -15,7 +15,7 @@ gw-config = { path = "../integration-test/godwoken/crates/config" }
 gw-traits = { path = "../integration-test/godwoken/crates/traits" }
 gw-generator = { path = "../integration-test/godwoken/crates/generator" }
 gw-jsonrpc-types = { path = "../integration-test/godwoken/crates/jsonrpc-types" }
-ckb-vm = { git = "https://github.com/nervosnetwork/ckb-vm.git", tag = "0.19.1", features = ["detect-asm"] }
+# ckb-vm = { version = "0.20.0-rc2", features = ["detect-asm"] }
 ethabi = "14.0.0"
 lazy_static = "1.4"
 tiny-keccak = "1.4"