Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#1979 Mac64: Update Travis to test 64-bit Mac and not 32-bit #4095

Merged
merged 3 commits into from
Feb 13, 2020
Merged

i#1979 Mac64: Update Travis to test 64-bit Mac and not 32-bit #4095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8a19dd
i#1979 Mac64: Update Travis to test 64-bit Mac and not 32-bit
derekbruening Feb 13, 2020
2c84066
Remove hardcoded 32_only for Mac in runsuite.cmake
derekbruening Feb 13, 2020
e17476f
Remove 4 failing tests from the green list
derekbruening Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,12 @@ jobs:
packages:
- clang-9
- clang-format-6.0
# 32-bit OSX build with clang and run tests:
# 64-bit OSX build with clang and run tests:
- if: env(TRAVIS_EVENT_TYPE) != cron
os: osx
# gcc on Travis claims to not be CMAKE_COMPILER_IS_GNUCC so we only run clang.
compiler: clang
# We do not have 64-bit support on OSX yet (i#1979).
env: DYNAMORIO_CROSS_AARCHXX_LINUX_ONLY=no DEPLOY=no EXTRA_ARGS=32_only
env: DYNAMORIO_CROSS_AARCHXX_LINUX_ONLY=no DEPLOY=no EXTRA_ARGS=64_only

#######################################################################
# Package jobs
Expand Down
4 changes: 2 additions & 2 deletions suite/runsuite.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ else (UNIX)
endif (UNIX)

if (APPLE)
# DRi#58: core DR does not yet support 64-bit Mac
set(arg_32_only ON)
# We no longer support 32-bit Mac since Apple itself does not either.
set(arg_64_only ON)
endif ()

##################################################
Expand Down
4 changes: 0 additions & 4 deletions suite/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4155,7 +4155,6 @@ if (APPLE)
set_tests_properties(
samples_proj
code_api|common.broadfun
code_api|common.decode-bad
code_api|common.fib
code_api|common.floatpc
code_api|common.floatpc_xl8all
Expand All @@ -4174,11 +4173,9 @@ if (APPLE)
code_api|security-common.codemod
code_api|security-common.retexisting
code_api|security-common.ret_noncall_trace
code_api|client.abort
code_api|client.crashmsg
code_api|client.count-ctis-noopt
code_api|client.exception
code_api|client.timer
code_api|client.syscall-mod
code_api|client.cbr-retarget
code_api|client.truncate
Expand All @@ -4189,7 +4186,6 @@ if (APPLE)
code_api|client.drcontainers-test
code_api|client.destructor
code_api|sample.signal
code_api|tool.drcpusim.simple
code_api|tool.drcpusim.cpuid-Prescott
code_api|tool.drcpusim.cpuid-Presler
code_api|tool.drcpusim.cpuid-Merom
Expand Down