File tree Expand file tree Collapse file tree 2 files changed +29
-2
lines changed
minimal-examples-lowlevel/http-client/minimal-http-client-multi Expand file tree Collapse file tree 2 files changed +29
-2
lines changed Original file line number Diff line number Diff line change @@ -106,13 +106,19 @@ endif()
106
106
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} /minimal-examples-lowlevel/http-server/minimal-http-server-tls
107
107
FIXTURES_SETUP hcm_srv
108
108
TIMEOUT 800 )
109
+ set_property (TEST st_hcm_srv PROPERTY ENVIRONMENT SAI_LIST_PORT=${PORT_HCM_SRV} )
110
+ set_property (TEST st_hcm_srv PROPERTY ENVIRONMENT VENDOR=$ENV{VENDOR} )
111
+
109
112
set_tests_properties (ki_hcm_srv PROPERTIES
110
113
FIXTURES_CLEANUP hcm_srv )
111
114
112
115
set_tests_properties (st_hcmp_srv PROPERTIES
113
116
WORKING_DIRECTORY .
114
117
FIXTURES_SETUP hcmp_srv
115
118
TIMEOUT 800 )
119
+ set_property (TEST st_hcmp_srv PROPERTY ENVIRONMENT SAI_LIST_PORT=1${PORT_HCM_SRV} )
120
+ set_property (TEST st_hcmp_srv PROPERTY ENVIRONMENT VENDOR=$ENV{VENDOR} )
121
+
116
122
set_tests_properties (ki_hcmp_srv PROPERTIES
117
123
FIXTURES_CLEANUP hcmp_srv )
118
124
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
#
3
+ # $SAI_LIST_PORT - optional, if present the ipv4 port number to wait on existing
3
4
# $SAI_INSTANCE_IDX - which instance of sai, 0+
4
5
# $1 - background fixture name, unique within test space, like "multipostlocalserver"
5
6
# $2 - executable
8
9
J=` basename $2 ` .$1 .$SAI_INSTANCE_IDX
9
10
$2 $3 $4 $5 $6 $7 $8 $9 2> /tmp/ctest-background-$J 1> /dev/null 0< /dev/null &
10
11
echo $! > /tmp/sai-ctest-$J
12
+
11
13
# really we want to loop until the listen port is up
12
14
# on, eg, rpi it can be blocked at sd card and slow to start
13
15
# due to parallel tests and disc cache flush
14
- if [ ! -z " ` echo $2 | grep valgrind` " ] ; then
15
- sleep 5
16
+
17
+ # echo "runscript SAI_LIST_PORT ${SAI_LIST_PORT}" > /tmp/q
18
+
19
+ if [ -z " ${SAI_LIST_PORT} " ] ; then
20
+
21
+ if [ ! -z " ` echo $2 | grep valgrind` " ] ; then
22
+ sleep 5
23
+ else
24
+ sleep 1
25
+ fi
16
26
else
27
+ if [ " ${VENDOR} " = " apple" ] ; then
28
+ while [ -z " ` netstat -an | grep LISTEN | tr -s ' ' | cut -d' ' -f4| grep " \.${SAI_LIST_PORT} \$ " ` " ] ; do
29
+ sleep 0.5
30
+ done
31
+ else
32
+ while [ -z " ` netstat -ltn4 | grep LISTEN | tr -s ' ' | grep " :${SAI_LIST_PORT} \ " ` " ] ; do
33
+ sleep 0.5
34
+ done
35
+ fi
36
+
17
37
sleep 1
18
38
fi
39
+
19
40
exit 0
20
41
You can’t perform that action at this time.
0 commit comments