Skip to content

Commit d6ad1d5

Browse files
authored
Use toit run|pkg instead of toit.{run|pkg} (#4)
1 parent d490575 commit d6ad1d5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tests/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44

55
file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_test.toit" "*-test.toit" "*_test_slow.toit" "*-test-slow.toit")
66

7-
# Add windows exe extension.
8-
set(TOIT_EXEC "toit.run${CMAKE_EXECUTABLE_SUFFIX}" CACHE FILEPATH "The executable used to run the tests")
9-
set(TPKG_EXEC "toit.pkg${CMAKE_EXECUTABLE_SUFFIX}" CACHE FILEPATH "The executable used to install the packages")
7+
set(TOIT_EXEC "toit${CMAKE_EXECUTABLE_SUFFIX}" CACHE FILEPATH "The executable used to run the tests")
108
set(TEST_TIMEOUT 40 CACHE STRING "The maximal amount of time each test is allowed to run")
119
set(SLOW_TEST_TIMEOUT 200 CACHE STRING "The maximal amount of time each slow test is allowed to run")
1210

13-
message("TPKG: ${TPKG_EXEC}")
1411
add_custom_target(
1512
"install-pkgs"
16-
COMMAND "${TPKG_EXEC}" install
13+
COMMAND "${TOIT_EXEC}" pkg install
1714
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
1815
)
1916

0 commit comments

Comments
 (0)