travis cmake version on macOS does not know --parallel option
This commit is contained in:
parent
53ceab9f91
commit
819e9025b1
26
test/run.py
26
test/run.py
@ -1,10 +1,4 @@
|
|||||||
#!/usr/bin/env python2.7
|
#!/usr/bin/env python2.7
|
||||||
'''
|
|
||||||
Windows notes:
|
|
||||||
generator = '-G"NMake Makefiles"'
|
|
||||||
make = 'nmake'
|
|
||||||
testBinary ='ixwebsocket_unittest.exe'
|
|
||||||
'''
|
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
@ -358,20 +352,12 @@ def run(testName, buildDir, sanitizer, xmlOutput, testRunName, buildOnly, useLLD
|
|||||||
# gen build files with CMake
|
# gen build files with CMake
|
||||||
runCMake(sanitizer, buildDir)
|
runCMake(sanitizer, buildDir)
|
||||||
|
|
||||||
# build with make
|
if platform.system() != 'Darwin':
|
||||||
#makeCmd = 'cmake --build '
|
# build with make
|
||||||
#jobs = '-j8'
|
runCommand('make -C {} -j8'.format(buildDir))
|
||||||
|
else:
|
||||||
#if platform.system() == 'Windows':
|
# build with cmake on recent
|
||||||
# makeCmd = 'nmake'
|
runCommand('cmake --build --parallel {}'.format(buildDir))
|
||||||
|
|
||||||
# nmake does not have a -j option
|
|
||||||
# jobs = ''
|
|
||||||
|
|
||||||
#runCommand('{} -C {} {}'.format(makeCmd, buildDir, jobs))
|
|
||||||
|
|
||||||
# build with cmake
|
|
||||||
runCommand('cmake --build --parallel ' + buildDir)
|
|
||||||
|
|
||||||
if buildOnly:
|
if buildOnly:
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user