Skip to content

Commit be7df0d

Browse files
lws-teamlws-team
committed
sspc: reduce length of UDS paths suitable for OSX
Co-developed-by: Gemini Pro 2.5
1 parent 88674df commit be7df0d

15 files changed

Lines changed: 34 additions & 17 deletions

File tree

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-blob/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ if (requirements)
7171
set(CTEST_SOCKET_PATH "@ctest-ssblobproxy-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
7272
else()
7373
# filesystem socket for others
74-
set(CTEST_SOCKET_PATH "/tmp/ctest-ssblobproxy-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
74+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
75+
set(CTEST_SOCKET_PATH "/tmp/ctest-ssblobproxy-$ENV{SAI_PROJECT}-${SHORT_HASH}")
7576
endif()
7677
add_test(NAME st_ssblobproxy COMMAND
7778
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-client-tx/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ if (requirements)
3434
set(CTEST_SOCKET_PATH "@ctest-sspctx-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
3535
else()
3636
# filesystem socket for others
37-
set(CTEST_SOCKET_PATH "/tmp/ctest-sspctx-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
37+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
38+
set(CTEST_SOCKET_PATH "/tmp/ctest-sspctx-$ENV{SAI_PROJECT}-${SHORT_HASH}")
3839
endif()
3940
add_test(NAME st_ssproxyctx COMMAND
4041
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-hugeurl/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ if (requirements)
7171
set(CTEST_SOCKET_PATH "@ctest-ssp-hurl-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
7272
else()
7373
# filesystem socket for others
74-
set(CTEST_SOCKET_PATH "/tmp/ctest-ssp-hurl-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
74+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
75+
set(CTEST_SOCKET_PATH "/tmp/ctest-ssp-hurl-$ENV{SAI_PROJECT}-${SHORT_HASH}")
7576
endif()
7677
add_test(NAME st_ssproxy-hurl COMMAND
7778
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-mqtt/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ if (requirements)
6363
set(CTEST_SOCKET_PATH "@ctest-mqttssp-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
6464
else()
6565
# filesystem socket for others
66-
set(CTEST_SOCKET_PATH "/tmp/ctest-mqttssp-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
66+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
67+
set(CTEST_SOCKET_PATH "/tmp/ctest-mqttssp-$ENV{SAI_PROJECT}-${SHORT_HASH}")
6768
endif()
6869
add_test(NAME st_mqttssproxy COMMAND
6970
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-perf/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ if (requirements)
7070
set(CTEST_SOCKET_PATH "@ctest-ssperfp-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
7171
else()
7272
# filesystem socket for others
73-
set(CTEST_SOCKET_PATH "/tmp/ctest-ssperfp-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
73+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
74+
set(CTEST_SOCKET_PATH "/tmp/ctest-ssperfp-$ENV{SAI_PROJECT}-${SHORT_HASH}")
7475
endif()
7576
add_test(NAME st_ssperfproxy COMMAND
7677
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-sigv4/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ if (requirements)
4646
set(CTEST_SOCKET_PATH "@ctest-sspsigv4-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
4747
else()
4848
# filesystem socket for others
49-
set(CTEST_SOCKET_PATH "/tmp/ctest-sspsigv4-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
49+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
50+
set(CTEST_SOCKET_PATH "/tmp/ctest-sspsigv4-$ENV{SAI_PROJECT}-${SHORT_HASH}")
5051
endif()
5152
add_test(NAME st_ssproxysigv4 COMMAND
5253
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-smd/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ if (requirements)
108108
set(CTEST_SOCKET_PATH "@ctest-sspsmd_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
109109
else()
110110
# filesystem socket for others
111-
set(CTEST_SOCKET_PATH "/tmp/ctest-sspsmd_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
111+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
112+
set(CTEST_SOCKET_PATH "/tmp/ctest-sspsmd_sspc-$ENV{SAI_PROJECT}-${SHORT_HASH}")
112113
endif()
113114

114115
add_test(NAME st_ssprxsmd_sspc COMMAND
@@ -151,7 +152,8 @@ if (requirements)
151152
set(CTEST_SOCKET_PATH "@ctest-mul-sspsmd_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
152153
else()
153154
# filesystem socket for others
154-
set(CTEST_SOCKET_PATH "/tmp/ctest-mul-sspsmd_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
155+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
156+
set(CTEST_SOCKET_PATH "/tmp/ctest-mul-sspsmd_sspc-$ENV{SAI_PROJECT}-${SHORT_HASH}")
155157
endif()
156158

157159
add_test(NAME st_mulssprxsmd_sspc COMMAND

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-stress/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ if (requirements)
7171
set(CTEST_SOCKET_PATH "@ctest-sspstress-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
7272
else()
7373
# filesystem socket for others
74-
set(CTEST_SOCKET_PATH "/tmp/ctest-sspstress-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
74+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
75+
set(CTEST_SOCKET_PATH "/tmp/ctest-sspstress-$ENV{SAI_PROJECT}-${SHORT_HASH}")
7576
endif()
7677
add_test(NAME st_ssstressproxy COMMAND
7778
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ if (requirements)
4848
set(CTEST_SOCKET_PATH "@ctest-ssptf-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
4949
else()
5050
# filesystem socket for others
51-
set(CTEST_SOCKET_PATH "/tmp/ctest-ssptf-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
51+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
52+
set(CTEST_SOCKET_PATH "/tmp/ctest-ssptf-$ENV{SAI_PROJECT}-${SHORT_HASH}")
5253
endif()
5354
add_test(NAME st_sstfproxy COMMAND
5455
${CMAKE_SOURCE_DIR}/scripts/ctest-background.sh

‎minimal-examples-lowlevel/secure-streams/minimal-secure-streams-threads/CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ if (requirements AND NOT WIN32)
6969
set(CTEST_SOCKET_PATH "@ctest-sspthreads_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
7070
else()
7171
# filesystem socket for others
72-
set(CTEST_SOCKET_PATH "/tmp/ctest-sspthreads_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
72+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
73+
set(CTEST_SOCKET_PATH "/tmp/ctest-sspthreads_sspc-$ENV{SAI_PROJECT}-${SHORT_HASH}")
7374
endif()
7475

7576
add_test(NAME st_ssprxthreads_sspc COMMAND
@@ -112,7 +113,8 @@ if (requirements AND NOT WIN32)
112113
set(CTEST_SOCKET_PATH "@ctest-mul-sspthreads_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
113114
else()
114115
# filesystem socket for others
115-
set(CTEST_SOCKET_PATH "/tmp/ctest-mul-sspthreads_sspc-$ENV{SAI_PROJECT}-$ENV{SAI_OVN}")
116+
string(SUBSTRING "$ENV{SAI_OVN}" 32 16 SHORT_HASH)
117+
set(CTEST_SOCKET_PATH "/tmp/ctest-mul-sspthreads_sspc-$ENV{SAI_PROJECT}-${SHORT_HASH}")
116118
endif()
117119

118120
add_test(NAME st_mulssprxthreads_sspc COMMAND

0 commit comments

Comments
 (0)