@@ -3,7 +3,7 @@ set -euo pipefail
33
44if [[ " ${1:- } " == " --help" ]]; then
55 cat << 'EOF '
6- Usage: scripts/smoke-tier2 .sh
6+ Usage: scripts/smoke-e2e .sh
77
88Runs the full same-machine end-to-end smoke checks:
99 - TCP listener mapping
@@ -44,7 +44,7 @@ TCP_IN_PID=""
4444UDP_IN_PID=" "
4545
4646announce () {
47- echo " tier2 : $* " >&2
47+ echo " e2e : $* " >&2
4848}
4949
5050dump_logs () {
@@ -106,8 +106,7 @@ wait_for_public_key() {
106106
107107wait_for_tcp_listener () {
108108 local pid=" $1 "
109- local log_path=" $2 "
110- local port=" $3 "
109+ local port=" $2 "
111110
112111 for _ in $( seq 1 100) ; do
113112 announce " wait for tcp listener"
172171
173172wait_for_udp_mapping () {
174173 local pid=" $1 "
175- local log_path=" $2 "
176174
177175 for _ in $( seq 1 5) ; do
178176 announce " wait for udp mapping"
@@ -210,7 +208,7 @@ launch_tcp_until_ready() {
210208 announce " tcp launch attempt ${attempt} "
211209 : > " $log_path "
212210 start_tcp_mapping " $pubkey " " $log_path "
213- if wait_for_tcp_listener " $TCP_IN_PID " " $log_path " " $ TCP_LOCAL_PORT" ; then
211+ if wait_for_tcp_listener " $TCP_IN_PID " " $TCP_LOCAL_PORT " ; then
214212 return 0
215213 fi
216214 stop_process TCP_IN_PID
@@ -228,7 +226,7 @@ launch_udp_until_ready() {
228226 announce " udp launch attempt ${attempt} "
229227 : > " $log_path "
230228 start_udp_mapping " $pubkey " " $log_path "
231- if UDP_RESULT=" $( wait_for_udp_mapping " $UDP_IN_PID " " $log_path " ) " ; then
229+ if UDP_RESULT=" $( wait_for_udp_mapping " $UDP_IN_PID " ) " ; then
232230 printf ' %s\n' " $UDP_RESULT "
233231 return 0
234232 fi
@@ -375,4 +373,4 @@ if [[ "$STDIO_RESULT" != "stdio-e2e" ]]; then
375373fi
376374
377375announce " stdio phase passed"
378- echo " tier2 : success"
376+ echo " e2e : success"
0 commit comments