Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit f694a23

Browse files
[[ cpptest ]] Do not build and run the tests as part of the default build target
1 parent 37e2199 commit f694a23

File tree

3 files changed

+26
-45
lines changed

3 files changed

+26
-45
lines changed

Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ guess_platform_script := \
6565
guess_platform := $(shell $(guess_platform_script))
6666

6767
all: all-$(guess_platform)
68+
check: check-$(guess_platform)
6869

6970
################################################################
7071
# Linux rules
@@ -86,11 +87,14 @@ config-linux-%:
8687
compile-linux-%:
8788
$(MAKE) -C build-linux-$*/livecode
8889

90+
check-linux-%:
91+
$(MAKE) -C build-linux-$*/livecode check
92+
8993
all-linux-%:
9094
$(MAKE) config-linux-$*
9195
$(MAKE) compile-linux-$*
9296

93-
$(addsuffix -linux,all config compile): %: %-$(guess_linux_arch)
97+
$(addsuffix -linux,all config compile check): %: %-$(guess_linux_arch)
9498

9599
################################################################
96100
# Android rules
@@ -104,11 +108,14 @@ config-android-%:
104108
compile-android-%:
105109
$(MAKE) -C build-android-$*/livecode
106110

111+
check-android-%:
112+
$(MAKE) -C build-android-$*/livecode check
113+
107114
all-android-%:
108115
$(MAKE) config-android-$*
109116
$(MAKE) compile-android-$*
110117

111-
$(addsuffix -android,all config compile): %: %-armv6
118+
$(addsuffix -android,all config compile check): %: %-armv6
112119

113120
################################################################
114121
# Mac rules
@@ -183,6 +190,9 @@ config-emscripten:
183190
compile-emscripten:
184191
$(EMMAKE) $(MAKE) -C build-emscripten/livecode
185192

193+
check-emscripten:
194+
$(EMMAKE) $(MAKE) -C build-emscripten/livecode check
195+
186196
all-emscripten:
187197
$(MAKE) config-emscripten
188198
$(MAKE) compile-emscripten

config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ fi
359359
################################################################
360360

361361
format_args="$(for f in ${FORMATS}; do echo --format ${f} ; done)"
362-
basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT}"
362+
basic_args="${format_args} --depth ${DEPTH} --generator-output ${GENERATOR_OUTPUT} -G default_target=default"
363363

364364
if [ "${BUILD_EDITION}" == "commercial" ] ; then
365365
basic_args="${basic_args} ../livecode-commercial.gyp"

livecode.gyp

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66

77
'targets':
88
[
9+
{
10+
'target_name': 'default',
11+
'type': 'none',
12+
'dependencies': [ 'binzip-copy', ],
13+
},
14+
15+
{
16+
'target_name': 'check',
17+
'type': 'none',
18+
'dependencies': [ 'cpptest-run-all', ],
19+
},
20+
921
{
1022
'target_name': 'LiveCode-all',
1123
'type': 'none',
@@ -180,48 +192,7 @@
180192
'files': [ '>@(dist_files)', '>@(dist_aux_files)', ],
181193
}],
182194
},
183-
184-
{
185-
'target_name': 'cpptest-all',
186-
'type': 'none',
187-
188-
'variables':
189-
{
190-
'javascriptify': ''
191-
},
192-
193-
'dependencies':
194-
[
195-
'libcpptest/libcpptest.gyp:test-libcpptest<(javascriptify)',
196-
'libfoundation/libfoundation.gyp:test-libFoundation<(javascriptify)',
197-
'engine/kernel-standalone.gyp:test-kernel-standalone<(javascriptify)',
198-
],
199-
200-
'conditions':
201-
[
202-
[
203-
'OS == "emscripten"',
204-
{
205-
'variables':
206-
{
207-
'javascriptify': '-javascriptify'
208-
},
209-
},
210-
],
211-
[
212-
'mobile == 0',
213-
{
214-
'dependencies':
215-
[
216-
'engine/kernel-server.gyp:test-kernel-server<(javascriptify)',
217-
'engine/kernel-development.gyp:test-kernel-development<(javascriptify)',
218-
'engine/kernel-installer.gyp:test-kernel-installer<(javascriptify)',
219-
],
220-
},
221-
],
222-
],
223-
},
224-
195+
225196
{
226197
'target_name': 'cpptest-run-all',
227198
'type': 'none',

0 commit comments

Comments
 (0)