Update scripts

gear-tech · Nov 28, 2024 · 439f3bd · 439f3bd
1 parent 4d6d0c0
commit 439f3bd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -105,6 +105,7 @@ jobs:
     runs-on: [kuberunner, github-runner-01]
     env:
       RUSTUP_HOME: /tmp/rustup_home
+      RUSTFLAGS: "--cfg fuzz"
     steps:
       - name: Cancel Previous Runs
         if: ${{ github.event_name == 'pull_request' }}

diff --git a/scripts/src/build.sh b/scripts/src/build.sh
@@ -26,11 +26,11 @@ EOF
 }
 
 gear_build() {
-  $CARGO build --workspace "$@" --exclude runtime-fuzzer --exclude runtime-fuzzer-fuzz
+  $CARGO build --workspace "$@"
 }
 
 fuzzer_build() {
-  $CARGO build "$@" -p runtime-fuzzer -p runtime-fuzzer-fuzz
+  RUSTFLAGS="--cfg fuzz" $CARGO build "$@" -p runtime-fuzzer -p runtime-fuzzer-fuzz
 }
 
 node_build() {

diff --git a/scripts/src/check.sh b/scripts/src/check.sh
@@ -20,11 +20,11 @@ EOF
 }
 
 gear_check() {
-  echo "  >> Check workspace without crates that use runtime with 'fuzz' feature"
-  __GEAR_WASM_BUILDER_NO_BUILD=1 SKIP_WASM_BUILD=1 SKIP_VARA_RUNTIME_WASM_BUILD=1 cargo check --workspace "$@" --exclude runtime-fuzzer --exclude runtime-fuzzer-fuzz
+  echo "  >> Check workspace"
+  __GEAR_WASM_BUILDER_NO_BUILD=1 SKIP_WASM_BUILD=1 SKIP_VARA_RUNTIME_WASM_BUILD=1 cargo check --workspace "$@"
 
-  echo "  >> Check crates that use runtime with 'fuzz' feature"
-  cargo check "$@" -p runtime-fuzzer -p runtime-fuzzer-fuzz
+  echo "  >> Check crates that use 'cfg(fuzz)"
+  RUSTFLAGS="--cfg fuzz" cargo check "$@" -p gear-common -p vara-runtime -p runtime-fuzzer -p runtime-fuzzer-fuzz
 }
 
 runtime_imports() {

diff --git a/scripts/src/test.sh b/scripts/src/test.sh
@@ -99,14 +99,16 @@ run_fuzzer() {
   fi
 
   # Run fuzzer
-  RUST_LOG="$LOG_TARGETS" cargo fuzz run --release --sanitizer=none main $CORPUS_DIR -- -rss_limit_mb=$RSS_LIMIT_MB -max_len=$MAX_LEN -len_control=0
+  RUSTFLAGS="--cfg fuzz" RUST_LOG="$LOG_TARGETS" \
+    cargo fuzz run --release --sanitizer=none main $CORPUS_DIR -- -rss_limit_mb=$RSS_LIMIT_MB -max_len=$MAX_LEN -len_control=0
 }
 
 run_lazy_pages_fuzzer() {
   . $(dirname "$SELF")/fuzzer_consts.sh
 
   ROOT_DIR="$1"
   CORPUS_DIR="$2"
+  RUSTFLAGS="--cfg fuzz"
 
   # Navigate to lazy pages fuzzer dir
   cd $ROOT_DIR/utils/lazy-pages-fuzzer
@@ -122,7 +124,7 @@ run_lazy_pages_fuzzer() {
 
 run_fuzzer_tests() {
   # This includes property tests for runtime-fuzzer.
-  cargo nextest run -p runtime-fuzzer
+  RUSTFLAGS="--cfg fuzz" cargo nextest run -p runtime-fuzzer
 }
 
 # TODO this is likely to be merged with `pallet_test` or `workspace_test` in #1802
@@ -134,7 +136,7 @@ doc_test() {
   MANIFEST="$1"
   shift
 
-  __GEAR_WASM_BUILDER_NO_BUILD=1 SKIP_WASM_BUILD=1 SKIP_VARA_RUNTIME_WASM_BUILD=1 $CARGO test --doc --workspace --exclude runtime-fuzzer --exclude runtime-fuzzer-fuzz --manifest-path="$MANIFEST" --no-fail-fast "$@"
+  __GEAR_WASM_BUILDER_NO_BUILD=1 SKIP_WASM_BUILD=1 SKIP_VARA_RUNTIME_WASM_BUILD=1 $CARGO test --doc --workspace --manifest-path="$MANIFEST" --no-fail-fast "$@"
 }
 
 time_consuming_tests() {