diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cpp b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cpp index e9b657edcea26..c63fc4ea0ad38 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-no-external-symbolizer.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // When `external_symbolizer_path` is empty on Darwin we fallback on using // dladdr as the symbolizer which means we get the symbol name // but no source location. The current implementation also doesn't try to diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cpp b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cpp index c9a9c4521b9ae..750df8109029f 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-partial-report-with-module-map.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // FIXME(dliew): We currently have to use module map for this test due to the atos // symbolizer changing the module name from an absolute path to just the file name. // rdar://problem/49784442 diff --git a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cpp b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cpp index 56e1e99409c82..7de28b0dfd172 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/asan-symbolize-with-module-map.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // RUN: %clangxx_asan -O0 -g %s -o %t.executable // Deliberately don't produce the module map and then check that offline symbolization fails diff --git a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cpp b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cpp index 4201d49df4d74..d50f0281980b9 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer-dyld-root-path.cpp @@ -7,8 +7,8 @@ // Due to a bug in atos, this only works on x86_64. // REQUIRES: asan-64-bits -// Path returned by `which atos` is invalid on iOS. -// UNSUPPORTED: ios +// Path returned by `which atos` is invalid on non-host +// UNSUPPORTED: darwin-remote #include #include diff --git a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cpp b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cpp index 7487bd4cb40e6..582359edddbc2 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/atos-symbolizer.cpp @@ -4,8 +4,8 @@ // RUN: which atos | tr -d '\n' > %t.symbolizer_path // RUN: %env_asan_opts=verbosity=2 ASAN_SYMBOLIZER_PATH=%{readfile:%t.symbolizer_path} not %run %t 2>&1 | FileCheck %s -// Path returned by `which atos` is invalid on iOS. -// UNSUPPORTED: ios, i386-darwin +// Path returned by `which atos` is invalid on non-host +// UNSUPPORTED: darwin-remote, i386-darwin #include #include diff --git a/compiler-rt/test/asan/TestCases/Darwin/duplicate_os_log_reports.cpp b/compiler-rt/test/asan/TestCases/Darwin/duplicate_os_log_reports.cpp index 40a168bc15290..e07b87aadfa01 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/duplicate_os_log_reports.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/duplicate_os_log_reports.cpp @@ -1,4 +1,4 @@ -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // REQUIRES: darwin_log_cmd // RUN: %clangxx_asan -fsanitize-recover=address %s -o %t // RUN: bash -c '{ %env_asan_opts=halt_on_error=0,log_to_syslog=1 %run %t > %t.process_output.txt 2>&1 & } \ diff --git a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cpp b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cpp index 89ee7a178525a..028bf235f8a46 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_reexec.cpp @@ -1,7 +1,7 @@ // When DYLD-inserting the ASan dylib from a different location than the // original, make sure we don't try to reexec. -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // RUN: rm -rf %t && mkdir -p %t // RUN: %clang_asan -print-file-name=lib | tr -d '\n' > %t.lib_name diff --git a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cpp b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cpp index 872848d075eaf..d1f6a80ac17cd 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/dyld_insert_libraries_remove.cpp @@ -2,7 +2,7 @@ // the ASan dylib from the environment variable (both when using an absolute // or relative path) and also that the other dylibs are left untouched. -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // RUN: rm -rf %t && mkdir -p %t // RUN: %clang_asan -print-file-name=lib | tr -d '\n' > %t.lib_name diff --git a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp index ddf93881555f9..0c5598093e66d 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.cpp @@ -51,6 +51,6 @@ // RUN: echo "=== NOTE === If you see a mismatch below, please update sanitizer_interface.inc files." // RUN: diff %t.imports-sorted %t.exports-sorted -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote int main() { return 0; } diff --git a/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp b/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp index 651d0c5d05b07..49ac9f756a8b3 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/suppressions-sandbox.cpp @@ -9,8 +9,8 @@ // Check that suppressing a function name works within a no-fork sandbox // RUN: echo "interceptor_via_fun:createCFString" > %t.supp // RUN: %env_asan_opts=suppressions='"%t.supp"' \ -// RUN: sandbox-exec -p '(version 1)(allow default)(deny process-fork)' \ -// RUN: %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s +// RUN: %run sandbox-exec -p '(version 1)(allow default)(deny process-fork)' \ +// RUN: %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s // sandbox-exec isn't available on iOS // UNSUPPORTED: ios diff --git a/compiler-rt/test/asan/TestCases/Darwin/uuid.cpp b/compiler-rt/test/asan/TestCases/Darwin/uuid.cpp index ba2d4494d3dac..1b7e60070313d 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/uuid.cpp +++ b/compiler-rt/test/asan/TestCases/Darwin/uuid.cpp @@ -4,8 +4,8 @@ // RUN: %clangxx_asan %s -o %t -fsanitize-recover=address // RUN: %env_asan_opts=print_module_map=2:halt_on_error=0 %run %t 2>&1 | FileCheck %s -// We can't run system("otool") in the simulator. -// UNSUPPORTED: ios +// We can't run system("otool") on remote devices. +// UNSUPPORTED: darwin-remote #include #include diff --git a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cpp b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cpp index 5d3e7a767e45a..ab57400b78c58 100644 --- a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cpp +++ b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cpp @@ -9,7 +9,7 @@ // RUN: %env_asan_opts=symbolize=0 not %run %t 2>&1 | %asan_symbolize | FileCheck %s // REQUIRES: stable-runtime -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote #if !defined(SHARED_LIB) #include diff --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_wrong_frame_number_bug.cpp b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_wrong_frame_number_bug.cpp index c3383d6082b44..6c71660f37541 100644 --- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_wrong_frame_number_bug.cpp +++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_wrong_frame_number_bug.cpp @@ -1,7 +1,7 @@ // This test case checks for an old bug when using plug-ins that caused // the stack numbering to be incorrect. // UNSUPPORTED: android -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // RUN: %clangxx_asan -O0 -g %s -o %t // RUN: %env_asan_opts=symbolize=0 not %run %t DUMMY_ARG > %t.asan_report 2>&1 diff --git a/compiler-rt/test/asan/TestCases/Posix/coverage.cpp b/compiler-rt/test/asan/TestCases/Posix/coverage.cpp index 9a3cb88cae3cd..d10cb94064425 100644 --- a/compiler-rt/test/asan/TestCases/Posix/coverage.cpp +++ b/compiler-rt/test/asan/TestCases/Posix/coverage.cpp @@ -17,7 +17,7 @@ // // https://code.google.com/p/address-sanitizer/issues/detail?id=263 // XFAIL: android -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote #include #include diff --git a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cpp b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cpp index ec91b6597fbe7..23d65100f96a8 100644 --- a/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cpp +++ b/compiler-rt/test/asan/TestCases/Posix/new_array_cookie_with_new_from_class.cpp @@ -4,7 +4,7 @@ // // XFAIL: target=arm{{.*}} -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote #include #include diff --git a/compiler-rt/test/asan/TestCases/default_ignorelist.cpp b/compiler-rt/test/asan/TestCases/default_ignorelist.cpp index c1277394680f1..afdd6ca4ffcc6 100644 --- a/compiler-rt/test/asan/TestCases/default_ignorelist.cpp +++ b/compiler-rt/test/asan/TestCases/default_ignorelist.cpp @@ -1,6 +1,6 @@ // FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316 // XFAIL: android, msvc -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote // // Test that ASan uses the default ignorelist from resource directory. // RUN: %clangxx_asan -### %s 2>&1 | FileCheck %s diff --git a/compiler-rt/test/asan/TestCases/log-path_test.cpp b/compiler-rt/test/asan/TestCases/log-path_test.cpp index 410e36ec5fec6..38a1ee1e12fbe 100644 --- a/compiler-rt/test/asan/TestCases/log-path_test.cpp +++ b/compiler-rt/test/asan/TestCases/log-path_test.cpp @@ -1,5 +1,5 @@ // FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316 -// UNSUPPORTED: ios, android +// UNSUPPORTED: darwin-remote, android // // RUN: %clangxx_asan %s -o %t diff --git a/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cpp b/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cpp index 0a028e2ebed6d..dbe9e71d2ca8e 100644 --- a/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cpp +++ b/compiler-rt/test/asan/TestCases/suppressions-exec-relative-location.cpp @@ -25,7 +25,7 @@ // FIXME: Upload suppressions to device. // XFAIL: android -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote #include #include diff --git a/compiler-rt/test/fuzzer/afl-driver-stderr.test b/compiler-rt/test/fuzzer/afl-driver-stderr.test index 1ee096001243d..4bc8c7bff05f7 100644 --- a/compiler-rt/test/fuzzer/afl-driver-stderr.test +++ b/compiler-rt/test/fuzzer/afl-driver-stderr.test @@ -1,6 +1,6 @@ # AFL doesn't work on Windows. No reason to test the driver. UNSUPPORTED: target={{.*(freebsd|windows).*}} -XFAIL: ios +XFAIL: darwin-remote RUN: %no_fuzzer_cpp_compiler %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver.cpp -o %t-AFLDriverTest ; Test that not specifying a stderr file isn't broken. diff --git a/compiler-rt/test/fuzzer/big-file-copy.test b/compiler-rt/test/fuzzer/big-file-copy.test index b92379460ac3b..324c10d1dc695 100644 --- a/compiler-rt/test/fuzzer/big-file-copy.test +++ b/compiler-rt/test/fuzzer/big-file-copy.test @@ -1,5 +1,5 @@ REQUIRES: darwin -UNSUPPORTED: ios +UNSUPPORTED: darwin-remote RUN: %cpp_compiler %S/BigFileCopy.cpp -o %t RUN: bash -c '%run %t -runs=1 -rss_limit_mb=4096 2>big-file-out.txt; result=$? \ RUN: %run rm -f big-file.txt big-file-out.txt && exit $result' diff --git a/compiler-rt/test/fuzzer/cross_over.test b/compiler-rt/test/fuzzer/cross_over.test index 5fc3b060b308f..f9f3e9c1188a3 100644 --- a/compiler-rt/test/fuzzer/cross_over.test +++ b/compiler-rt/test/fuzzer/cross_over.test @@ -1,5 +1,5 @@ # For IOS, we fail to permute the run lines properly (rdar://99889376) -XFAIL: ios && !iossim +XFAIL: darwin-remote && !iossim # Tests CrossOverTest. # We want to make sure that the test can find the input # ABCDEFGHIJ when given two other inputs in the seed corpus: diff --git a/compiler-rt/test/fuzzer/merge-control-file.test b/compiler-rt/test/fuzzer/merge-control-file.test index c7d666ea471e9..294ba0eb0a3c1 100644 --- a/compiler-rt/test/fuzzer/merge-control-file.test +++ b/compiler-rt/test/fuzzer/merge-control-file.test @@ -1,5 +1,5 @@ # For IOS, we fail to permute the run lines properly (rdar://99889376) -XFAIL: ios && !iossim +XFAIL: darwin-remote && !iossim RUN: mkdir -p %t # Use a ".exe" extension because it is needed on Windows to call system() # to execute itself again. diff --git a/compiler-rt/test/fuzzer/merge-posix.test b/compiler-rt/test/fuzzer/merge-posix.test index fc64540d7ed39..26af828807616 100644 --- a/compiler-rt/test/fuzzer/merge-posix.test +++ b/compiler-rt/test/fuzzer/merge-posix.test @@ -1,4 +1,4 @@ -XFAIL: ios +XFAIL: darwin-remote # Uses ulimit # UNSUPPORTED: system-windows RUN: %cpp_compiler %S/FullCoverageSetTest.cpp -o %t-FullCoverageSetTest diff --git a/compiler-rt/test/fuzzer/seed_inputs.test b/compiler-rt/test/fuzzer/seed_inputs.test index 45cec5ed50164..6b303d408844a 100644 --- a/compiler-rt/test/fuzzer/seed_inputs.test +++ b/compiler-rt/test/fuzzer/seed_inputs.test @@ -1,5 +1,5 @@ # Uses echo in a way that is not supported by the iOS "run-on-device" script. -UNSUPPORTED: ios +UNSUPPORTED: darwin-remote RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index a6913318591c9..d8e11051181d6 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -419,15 +419,19 @@ def get_ios_commands_dir(): # ========================================================================= # Target | Feature set # ========================================================================= - # macOS | darwin - # iOS device | darwin, ios - # iOS simulator | darwin, ios, iossim - # tvOS device | darwin, ios, tvos - # tvOS simulator | darwin, ios, iossim, tvos, tvossim - # watchOS device | darwin, ios, watchos - # watchOS simulator | darwin, ios, iossim, watchos, watchossim + # macOS host | darwin + # macOS device | darwin, darwin-remote + # iOS device | darwin, darwin-remote, ios + # iOS simulator | darwin, darwin-remote, ios, iossim + # tvOS device | darwin, darwin-remote, ios, tvos + # tvOS simulator | darwin, darwin-remote, ios, iossim, tvos, tvossim + # watchOS device | darwin, darwin-remote, ios, watchos + # watchOS simulator | darwin, darwin-remote, ios, iossim, watchos, watchossim # ========================================================================= + # All suites that aren't running on the host get the darwin-remote feature. + config.available_features.add("darwin-remote") + # All non-OSX targets have the ios feature (see the above table) if config.apple_platform != "osx": config.available_features.add("ios") diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp index 5aae80de89be7..3797c469eb186 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp +++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp @@ -6,7 +6,7 @@ // UNSUPPORTED: x86_64h-darwin && lsan // XFAIL: tsan // XFAIL: android && asan -// XFAIL: ios +// XFAIL: darwin-remote // RUN: rm -rf %t_workdir // RUN: mkdir -p %t_workdir diff --git a/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c b/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c index b8ca5c739f428..da6ceaf15b52c 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c +++ b/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c @@ -6,7 +6,7 @@ // RUN: %env_tool_opts=log_path=%t.dir/sanitizer.log:log_exe_name=1:log_suffix=.txt %run %t.dir/suffix-log-path_test-binary 2> %t.out // RUN: FileCheck %s < %t.dir/sanitizer.log.suffix-log-path_test-binary.*.txt -// UNSUPPORTED: ios, android +// UNSUPPORTED: darwin-remote, android #include #include diff --git a/compiler-rt/test/tsan/Darwin/dlopen.cpp b/compiler-rt/test/tsan/Darwin/dlopen.cpp index 2ab052f1c0c26..6ad5cc68fe275 100644 --- a/compiler-rt/test/tsan/Darwin/dlopen.cpp +++ b/compiler-rt/test/tsan/Darwin/dlopen.cpp @@ -4,7 +4,7 @@ // REQUIRES: osx-autointerception -// XFAIL: ios +// XFAIL: darwin-remote // RUN: %clangxx_tsan %s -o %t.so -shared -DSHARED_LIB // RUN: %clangxx_tsan -fno-sanitize=thread %s -o %t diff --git a/compiler-rt/test/tsan/Darwin/dyld-insert-libraries.c b/compiler-rt/test/tsan/Darwin/dyld-insert-libraries.c index 2e28a23c227bc..86f3f63a4af24 100644 --- a/compiler-rt/test/tsan/Darwin/dyld-insert-libraries.c +++ b/compiler-rt/test/tsan/Darwin/dyld-insert-libraries.c @@ -9,7 +9,7 @@ // // RUN: env DYLD_INSERT_LIBRARIES=%t.dylib %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer' // -// XFAIL: ios +// XFAIL: darwin-remote #include #include diff --git a/compiler-rt/test/tsan/Darwin/write-interpose.c b/compiler-rt/test/tsan/Darwin/write-interpose.c index 51ff3ee3d0df9..feae0180a5276 100644 --- a/compiler-rt/test/tsan/Darwin/write-interpose.c +++ b/compiler-rt/test/tsan/Darwin/write-interpose.c @@ -8,7 +8,7 @@ // deadlock (self-lock) // RUN: env DYLD_INSERT_LIBRARIES=%t.dylib TSAN_OPTIONS=verbosity=2:lock_during_write=disable_for_current_process %run %t 2>&1 | FileCheck %s // -// UNSUPPORTED: ios +// UNSUPPORTED: darwin-remote #include