Skip to content

Commit 7f84ead

Browse files
committed
Post merge fixups
1 parent f8c91d6 commit 7f84ead

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,6 @@ jobs:
342342
run: |
343343
cmake --build out --config MinSizeRel --target test-17python test-20python
344344
echo Running test-17python
345-
out/test/test-17python -ni -fc
345+
out/test/test-17python
346346
echo Running test-20python
347-
out/test/test-20python -ni -fc
347+
out/test/test-20python

test/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ foreach(STORAGE_SUFFIX ${STORAGE_TYPES})
128128
CXX_VISIBILITY_PRESET hidden
129129
VISIBILITY_INLINES_HIDDEN ON
130130
XCODE_GENERATE_SCHEME TRUE
131-
XCODE_SCHEME_ARGUMENTS "-ni;-nc"
132131
)
133132

134133
target_compile_options(test-${TEST_SUFFIX} PRIVATE
@@ -197,11 +196,11 @@ foreach(STORAGE_SUFFIX ${STORAGE_TYPES})
197196
list(APPEND TEST_COMMAND COMMAND echo "Running test-${TEST_SUFFIX}")
198197
if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
199198
list(APPEND TEST_COMMAND COMMAND ${ADB} push test-${TEST_SUFFIX} ${ANDROID_TEST_DIR})
200-
list(APPEND TEST_COMMAND COMMAND ${ADB} shell LD_LIBRARY_PATH=${ANDROID_LD_LIBRARY_PATH} ${ANDROID_TEST_DIR}/test-${TEST_SUFFIX} -ni)
199+
list(APPEND TEST_COMMAND COMMAND ${ADB} shell LD_LIBRARY_PATH=${ANDROID_LD_LIBRARY_PATH} ${ANDROID_TEST_DIR}/test-${TEST_SUFFIX})
201200
elseif (DEFINED EMSCRIPTEN)
202-
list(APPEND TEST_COMMAND COMMAND ${NODE_JS_EXECUTABLE} test-${TEST_SUFFIX} -ni)
201+
list(APPEND TEST_COMMAND COMMAND ${NODE_JS_EXECUTABLE} test-${TEST_SUFFIX})
203202
else()
204-
list(APPEND TEST_COMMAND COMMAND test-${TEST_SUFFIX} -ni)
203+
list(APPEND TEST_COMMAND COMMAND test-${TEST_SUFFIX})
205204
endif()
206205

207206
list(APPEND TEST_DEPS test-${TEST_SUFFIX})

0 commit comments

Comments
 (0)