summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2024-04-04 20:06:58 -0700
committerMaciej Żenczykowski <maze@google.com>2024-04-05 11:39:26 -0700
commitef5ee4da9794ac35220c901ced6f96027dc34f64 (patch)
tree2c8cbddd03eead5549ec2300a74bf995a8d3c5fb
parente6ab8ea49e189f92b2f238a835285862677bf926 (diff)
downloadtests-ef5ee4da9794ac35220c901ced6f96027dc34f64.tar.gz
net-test: run_net_test.sh - rework CONFIG_FRAME_WARN
The previous version isn't able to build ACK 5.10-T kernel. (Somehow even though it tries to disable it still ends up with 2048) Test: manually on ACK 5.10-T Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I9292766a9ba8e675bd36b2390246f1703fc157ba
-rwxr-xr-xnet/test/run_net_test.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index 8d44cf3..a496241 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -88,9 +88,6 @@ OPTIONS="$OPTIONS INIT_STACK_NONE"
# These two break the flo kernel due to differences in -Werror on recent GCC.
DISABLE_OPTIONS=" REISERFS_FS ANDROID_PMEM"
-# Disable frame size warning on arm64. GCC 10 generates >1k stack frames.
-DISABLE_OPTIONS="$DISABLE_OPTIONS FRAME_WARN"
-
# How many TAP interfaces to create to provide the VM with real network access
# via the host. This requires privileges (e.g., root access) on the host.
#
@@ -303,6 +300,9 @@ if ((nobuild == 0)); then
# Enable the kernel config options listed in $OPTIONS.
$CONFIG_SCRIPT --file $CONFIG_FILE ${OPTIONS// / -e }
+ # Increase acceptable frame size.
+ $CONFIG_SCRIPT --file $CONFIG_FILE --set-val FRAME_WARN 3172
+
# Disable the kernel config options listed in $DISABLE_OPTIONS.
$CONFIG_SCRIPT --file $CONFIG_FILE ${DISABLE_OPTIONS// / -d }