feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Reduce filesize of the tests on MinGW (#2995)

Browse Source 
This patch removes the workaround applied here
1acfd07f1e.
MinGW is not tested on Appveyor anymore.
This commit is contained in:
Dimitrij Mijoski
2022-07-23 05:11:33 +02:00
committed by GitHub
parent 48e0a59222
commit bbcb129e02
2 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
support/appveyor-build.py
View File

@ -11,32 +11,23 @@ path = os.environ['PATH']
image = os.environ['APPVEYOR_BUILD_WORKER_IMAGE'] image = os.environ['APPVEYOR_BUILD_WORKER_IMAGE']
jobid = os.environ['APPVEYOR_JOB_ID'] jobid = os.environ['APPVEYOR_JOB_ID']
cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config, '..'] cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config, '..']
if build == 'mingw': # Add MSBuild 14.0 to PATH as described in
cmake_command.append('-GMinGW Makefiles') # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
build_command = ['mingw32-make', '-j4'] os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path
test_command = ['mingw32-make', 'test'] if image == 'Visual Studio 2019':
# Remove the path to Git bin directory from $PATH because it breaks generator = 'Visual Studio 16 2019'
# MinGW config. if platform == 'x64':
path = path.replace(r'C:\Program Files (x86)\Git\bin', '') cmake_command.extend(['-A', 'x64'])
os.environ['PATH'] = r'C:\MinGW\bin;' + path
else: else:
# Add MSBuild 14.0 to PATH as described in if image == 'Visual Studio 2015':
# http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc. generator = 'Visual Studio 14 2015'
os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\15.0\Bin;' + path elif image == 'Visual Studio 2017':
if image == 'Visual Studio 2019': generator = 'Visual Studio 15 2017'
generator = 'Visual Studio 16 2019' if platform == 'x64':
if platform == 'x64': generator += ' Win64'
cmake_command.extend(['-A', 'x64']) cmake_command.append('-G' + generator)
else: build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4']
if image == 'Visual Studio 2015': test_command = ['ctest', '-C', config]
generator = 'Visual Studio 14 2015'
elif image == 'Visual Studio 2017':
generator = 'Visual Studio 15 2017'
if platform == 'x64':
generator += ' Win64'
cmake_command.append('-G' + generator)
build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4']
test_command = ['ctest', '-C', config]
check_call(cmake_command) check_call(cmake_command)
check_call(build_command) check_call(build_command)

3
test/CMakeLists.txt
View File

@ -8,9 +8,6 @@ target_link_libraries(test-main gtest fmt)
function(add_fmt_executable name) function(add_fmt_executable name)
add_executable(${name} ${ARGN}) add_executable(${name} ${ARGN})
if (MINGW)
target_link_libraries(${name} -static-libgcc -static-libstdc++)
endif ()
# (Wstringop-overflow) - [meta-bug] bogus/missing -Wstringop-overflow warnings # (Wstringop-overflow) - [meta-bug] bogus/missing -Wstringop-overflow warnings
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88443 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88443
# Bogus -Wstringop-overflow warning # Bogus -Wstringop-overflow warning