Skip to content

Commit f8bfb26

Browse files
committed
reduce verbosity of tests
1 parent ec315e9 commit f8bfb26

9 files changed

+15
-23
lines changed

TESTING.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ requiring netns cookie support are skipped automatically.
1818
Install packages used to facilitate testing:
1919

2020
```
21-
$ sudo dnf install iperf3 qperf kernel-uek-modules-extra clang llvm bpftool libbpf-devel libcap-devel
21+
$ sudo dnf install iperf3 qperf proxyt kernel-uek-modules-extra clang llvm bpftool libbpf-devel libcap-devel
2222
$ sudo dnf module install container-tools:ol8
2323
```
2424

2525
iperf3, qperf are needed for perf testing; kernel-uek-modules-extra is
26-
needed for sch-netem; the latter 5 packages are needed to build the sample
27-
tuner.
26+
needed for sch-netem; proxyt is used by podman to connect to the container
27+
registry; may not be needed depending on the network connectivity/podman
28+
config used. If podman is not installed or registry reachable, tests
29+
will be skipped.
30+
31+
The latter 5 packages are needed to build the sample tuner.
2832

2933
podman is optional and is used to verify container support in bpftune.
3034

test/neigh_table_legacy_test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ for TUNER in neigh_table ; do
2424

2525
test_setup "true"
2626

27-
test_run_cmd_local "$BPFTUNE -dsL &" true
27+
test_run_cmd_local "$BPFTUNE -sL &" true
2828

2929
sleep $SETUPTIME
3030

@@ -49,10 +49,6 @@ for TUNER in neigh_table ; do
4949
$PREFIX_CMD ip neigh replace $ip6addr lladdr $macaddr dev $INTF
5050
fi
5151
done
52-
echo "Following changes were made:"
53-
set +e
54-
grep bpftune $LOGFILE
55-
set -e
5652
grep "table nearly full" $LOGFILE
5753
test_pass
5854
done

test/neigh_table_test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ for TUNER in neigh_table ; do
2424

2525
test_setup "true"
2626

27-
test_run_cmd_local "$BPFTUNE -ds &" true
27+
test_run_cmd_local "$BPFTUNE -s &" true
2828

2929
sleep $SETUPTIME
3030

@@ -49,10 +49,6 @@ for TUNER in neigh_table ; do
4949
$PREFIX_CMD ip neigh replace $ip6addr lladdr $macaddr dev $INTF
5050
fi
5151
done
52-
echo "Following changes were made:"
53-
set +e
54-
grep bpftune $LOGFILE
55-
set -e
5652
grep "table nearly full" $LOGFILE
5753
test_pass
5854
done

test/rmem_legacy_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ for FAMILY in ipv4 ipv6 ; do
4343
echo "Running ${MODE}..."
4444
test_run_cmd_local "ip netns exec $NETNS $IPERF3 -s -p $PORT -1 &"
4545
if [[ $MODE != "baseline" ]]; then
46-
test_run_cmd_local "$BPFTUNE -dL &"
46+
test_run_cmd_local "$BPFTUNE -L &"
4747
sleep $SETUPTIME
4848
else
4949
LOGSZ=$(wc -l $LOGFILE | awk '{print $1}')

test/rmem_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ for FAMILY in ipv4 ipv6 ; do
4343
echo "Running ${MODE}..."
4444
test_run_cmd_local "ip netns exec $NETNS $IPERF3 -s -p $PORT -1 &"
4545
if [[ $MODE != "baseline" ]]; then
46-
test_run_cmd_local "$BPFTUNE -d &"
46+
test_run_cmd_local "$BPFTUNE &"
4747
sleep $SETUPTIME
4848
else
4949
LOGSZ=$(wc -l $LOGFILE | awk '{print $1}')

test/route_table_test.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ for TUNER in route_table ; do
3636
$PREFIX_CMD sysctl -w net.ipv6.route.gc_thresh=16
3737
$PREFIX_CMD sysctl -w net.ipv6.route.max_size=32
3838

39-
test_run_cmd_local "$BPFTUNE -ds &" true
39+
test_run_cmd_local "$BPFTUNE -s &" true
4040

4141
sleep $SETUPTIME
4242

@@ -54,10 +54,6 @@ for TUNER in route_table ; do
5454
sleep $SLEEPTIME
5555
sleep $SLEEPTIME
5656
sleep $SLEEPTIME
57-
echo "Following changes were made:"
58-
set +e
59-
grep bpftune $LOGFILE
60-
set -e
6157
max_size_post=($($PREFIX_CMD sysctl -n net.ipv6.route.max_size))
6258
$PREFIX_CMD sysctl -w net.ipv6.route.max_size="$max_size_orig"
6359
$PREFIX_CMD sysctl -w net.ipv6.route.gc_thresh="$thresh_orig"

test/sysctl_legacy_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for TUNER in neigh_table ; do
1717

1818
test_setup "true"
1919

20-
test_run_cmd_local "$BPFTUNE -dsL &" true
20+
test_run_cmd_local "$BPFTUNE -sL &" true
2121

2222
sleep $SETUPTIME
2323
for SYSCTL in net.ipv4.neigh.default.gc_thresh1 kernel.core_pattern ; do

test/sysctl_netns_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ for TUNER in neigh_table ; do
2121

2222
sysctl -qw net.ipv4.tcp_rmem="${rmem_orig[0]} ${rmem_orig[1]} ${rmem_orig[1]}"
2323

24-
test_run_cmd_local "$BPFTUNE -ds &" true
24+
test_run_cmd_local "$BPFTUNE -s &" true
2525

2626
sleep $SETUPTIME
2727

test/sysctl_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for TUNER in neigh_table ; do
1717

1818
test_setup "true"
1919

20-
test_run_cmd_local "$BPFTUNE -ds &" true
20+
test_run_cmd_local "$BPFTUNE -s &" true
2121

2222
sleep $SETUPTIME
2323
for SYSCTL in net.ipv4.neigh.default.gc_thresh1 kernel.core_pattern ; do

0 commit comments

Comments
 (0)