From 226a2b28f6e1a05c51fe86aff87220d58c2c443a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Aug 2023 18:53:06 +0200 Subject: [PATCH 1/7] Utility: fix another CMake error with Xcode "new build system". New build system and it's clearly worse than the old. Typical 2020s, yes. --- src/Corrade/Utility/Test/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Corrade/Utility/Test/CMakeLists.txt b/src/Corrade/Utility/Test/CMakeLists.txt index 55023c568..4ae52591a 100644 --- a/src/Corrade/Utility/Test/CMakeLists.txt +++ b/src/Corrade/Utility/Test/CMakeLists.txt @@ -423,6 +423,13 @@ if(CORRADE_BUILD_STATIC AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET add_library(UtilityGlobalStateAcrossLibrariesLibrary SHARED GlobalStateAcrossLibrariesLibrary.cpp ${ResourceTestData}) + if(CMAKE_GENERATOR STREQUAL Xcode) + # Xcode's "new build system" doesn't like when the same (generated) + # source file is used by two different targets (ResourceTestDataLib and + # UtilityGlobalStateAcrossLibrariesLibrary) that don't have any other + # dependency between them. WTF. + add_dependencies(UtilityGlobalStateAcrossLibrariesLibrary ResourceTestDataLib) + endif() target_link_libraries(UtilityGlobalStateAcrossLibrariesLibrary PRIVATE CorradeUtility) corrade_add_test(UtilityGlobalStateAcrossLibrariesTest From b8692e576436e7f3ef7508e4239f9070d85dfc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Aug 2023 18:53:24 +0200 Subject: [PATCH 2/7] CMake: detect iOS target primarily from CMAKE_SYSTEM_NAME. This also means CORRADE_TARGET_IOS_SIMULATOR is no longer set for simulator builds. Let's see how many test breakages that causes. Well actually the tests don't run on iOS at all now, so even the breakages would be better than the current state. --- CMakeLists.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27de11dea..09816241d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,22 @@ elseif(UNIX) if(APPLE) set(CORRADE_TARGET_APPLE 1) - if(CMAKE_OSX_SYSROOT MATCHES "/iPhoneOS[0-9.]*\\.sdk") + # Since CMake 3.14, setting CMAKE_SYSTEM_NAME to iOS and not using any + # explicit toolchain file is the builtin way to build for iOS, not by + # overriding CMAKE_OSX_SYSROOT. For backwards compatiblity the + # CMAKE_OSX_SYSROOT check is present as well, but it isn't expected to + # be set anymore. + # + # CMAKE_OSX_SYSROOT originally also used to be used for switching + # between a device and a simulator build. Nowadays, an iOS binary is + # often made "fat", containing both device and simulator code, and + # building for either a device or the simulator is controlled via a + # -sdk option passed at the *build* time, i.e. there's no way to know + # whether it'll be a simulator at the *configure* time. Thus + # CORRADE_TARGET_IOS_SIMULATOR is no longer set. + if(CMAKE_SYSTEM_NAME STREQUAL iOS) + set(CORRADE_TARGET_IOS 1) + elseif(CMAKE_OSX_SYSROOT MATCHES "/iPhoneOS[0-9.]*\\.sdk") set(CORRADE_TARGET_IOS 1) elseif(CMAKE_OSX_SYSROOT MATCHES "/iPhoneSimulator[0-9.]*\\.sdk") set(CORRADE_TARGET_IOS 1) From 1cd814e3d24c98fe54a0fb31dc221432d801d04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Aug 2023 18:27:02 +0200 Subject: [PATCH 3/7] [wip] --- package/ci/circleci.yml | 74 ++++++++++++++++++------------------- package/ci/ios-simulator.sh | 8 ++-- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index 6063e7c0c..d4276281c 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -444,40 +444,40 @@ workflows: # if they pass, the rest of the jobs gets gradually executed, with further # dependencies especially for the macOS jobs that take the most credits. jobs: - - linux - - linux-nondeprecated - - linux-arm64: - requires: - - linux - - linux-nondeprecated - - linux-static: - requires: - - linux - - linux-nondeprecated - - linux-sanitizers: - requires: - - linux - - linux-nondeprecated - - linux-threadsanitizer: - requires: - - linux-sanitizers - - macos: - requires: - - linux - - linux-nondeprecated - - macos-static: - requires: - - macos - - linux-static - - emscripten: - requires: - - linux-static - - android-x86: - requires: - - linux-static - - linux-arm64 - - ios: - requires: - - macos-static - - linux-arm64 - - acme + # - linux + # - linux-nondeprecated + # - linux-arm64: + # requires: + # - linux + # - linux-nondeprecated + # - linux-static: + # requires: + # - linux + # - linux-nondeprecated + # - linux-sanitizers: + # requires: + # - linux + # - linux-nondeprecated + # - linux-threadsanitizer: + # requires: + # - linux-sanitizers + # - macos: + # requires: + # - linux + # - linux-nondeprecated + # - macos-static: + # requires: + # - macos + # - linux-static + # - emscripten: + # requires: + # - linux-static + # - android-x86: + # requires: + # - linux-static + # - linux-arm64 + - ios + # requires: + # - macos-static + # - linux-arm64 + # - acme diff --git a/package/ci/ios-simulator.sh b/package/ci/ios-simulator.sh index 49e3171eb..dd3e8dc00 100755 --- a/package/ci/ios-simulator.sh +++ b/package/ci/ios-simulator.sh @@ -19,17 +19,17 @@ cd .. # Crosscompile mkdir build-ios && cd build-ios cmake .. \ - -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/iOS.cmake \ - -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk \ + -DCMAKE_SYSTEM_NAME=iOS \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ + -DCMAKE_OSX_SYSROOT=iphonesimulator \ -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCORRADE_BUILD_STATIC=ON \ -DCORRADE_BUILD_TESTS=ON \ -DCORRADE_TESTSUITE_TARGET_XCTEST=ON \ -G Xcode -set -o pipefail && cmake --build . --config Release -j$XCODE_JOBS | xcbeautify +set -o pipefail && cmake --build . --config Release -j$XCODE_JOBS -- -sdk iphonesimulator | xcbeautify CORRADE_TEST_COLOR=ON ctest -V -C Release # Test install, after running the tests as for them it shouldn't be needed -set -o pipefail && cmake --build . --config Release --target install -j$XCODE_JOBS | xcbeautify +set -o pipefail && cmake --build . --config Release --target install -j$XCODE_JOBS -- -sdk iphonesimulator | xcbeautify From d46c533ef72511dc37181f3962fbd58ad2d6840d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Aug 2023 21:38:01 +0200 Subject: [PATCH 4/7] [wip] --- modules/UseCorrade.cmake | 24 +++++++++++++----------- package/ci/ios-simulator.sh | 7 +++++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/modules/UseCorrade.cmake b/modules/UseCorrade.cmake index 4a358cb5d..5b712e8c9 100644 --- a/modules/UseCorrade.cmake +++ b/modules/UseCorrade.cmake @@ -450,18 +450,20 @@ function(corrade_add_test test_name) ${test_runner_file}) xctest_add_bundle(${test_name}Runner ${test_name} ${test_runner_file}) if(CORRADE_TARGET_IOS) - # The EFFECTIVE_PLATFORM_NAME variable is not expanded when using - # TARGET_* generator expressions on iOS, we need to hardcode it - # manually. See http://public.kitware.com/pipermail/cmake/2016-March/063049.html - # In case we redirect the runtime output directory, use that (and - # assume there's no TARGET_* generator expression). This will of - # course break when someone sets the LIBRARY_OUTPUT_DIRECTORY - # property of the target, but that didn't work before either. - if(CMAKE_LIBRARY_OUTPUT_DIRECTORY) - add_test(NAME ${test_name} COMMAND ${XCTest_EXECUTABLE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${test_name}Runner.xctest) - else() - add_test(NAME ${test_name} COMMAND ${XCTest_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/$${_CORRADE_EFFECTIVE_PLATFORM_NAME}/${test_name}Runner.xctest) + if(NOT CORRADE_TESTSUITE_XCTEST_DESTINATION) + message(FATAL_ERROR "On iOS with CORRADE_TESTSUITE_TARGET_XCTEST enabled you need to set CORRADE_TESTSUITE_XCTEST_DESTINATION to a destination on which the tests should be run, such as \"platform=iOS Simulator,name=iPhone 12\"") endif() + add_test(NAME ${test_name} + # TODO Running build-for-testing and then + # xcodebuild -xctestrun ${test_name}Runner.*.xctestrun + # with the generated files is significantly faster (probably + # because it doesn't need to parse the whole project every + # time), but so far I don't see how to run that as part of the + # build for all schemes + COMMAND xcodebuild test-without-building -scheme ${test_name}Runner -destination "${CORRADE_TESTSUITE_XCTEST_DESTINATION}" -only-testing:${test_name}Runner -only-test-configuration $ + # Has to be run in the directory where the xcodeproj is + # generated + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) else() xctest_add_test(${test_name} ${test_name}Runner) endif() diff --git a/package/ci/ios-simulator.sh b/package/ci/ios-simulator.sh index dd3e8dc00..a26e0734f 100755 --- a/package/ci/ios-simulator.sh +++ b/package/ci/ios-simulator.sh @@ -27,8 +27,15 @@ cmake .. \ -DCORRADE_BUILD_STATIC=ON \ -DCORRADE_BUILD_TESTS=ON \ -DCORRADE_TESTSUITE_TARGET_XCTEST=ON \ + -DCORRADE_TESTSUITE_XCTEST_DESTINATION="platform=iOS Simulator,name=iPhone 8" \ -G Xcode set -o pipefail && cmake --build . --config Release -j$XCODE_JOBS -- -sdk iphonesimulator | xcbeautify + +# Boot a simulator before running tests. It's not required, but makes the tests +# run significantly faster (apparently because it then doesn't have to boot and +# shutdown a simulator every time?? ugh) +xcrun simctl boot "iPhone 8" + CORRADE_TEST_COLOR=ON ctest -V -C Release # Test install, after running the tests as for them it shouldn't be needed From c60e2092031703705c033ad58ada435e2ba1ce9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Aug 2023 21:55:52 +0200 Subject: [PATCH 5/7] [wip] --- modules/UseCorrade.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/UseCorrade.cmake b/modules/UseCorrade.cmake index 5b712e8c9..90f71287b 100644 --- a/modules/UseCorrade.cmake +++ b/modules/UseCorrade.cmake @@ -460,7 +460,7 @@ function(corrade_add_test test_name) # because it doesn't need to parse the whole project every # time), but so far I don't see how to run that as part of the # build for all schemes - COMMAND xcodebuild test-without-building -scheme ${test_name}Runner -destination "${CORRADE_TESTSUITE_XCTEST_DESTINATION}" -only-testing:${test_name}Runner -only-test-configuration $ + COMMAND xcodebuild test-without-building -scheme ${test_name}Runner -configuration $ -destination "${CORRADE_TESTSUITE_XCTEST_DESTINATION}" -only-testing:${test_name}Runner # Has to be run in the directory where the xcodeproj is # generated WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) From 4f234e9afd6c7523c87088ae8697cda6f543f529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 14 Aug 2023 22:30:17 +0200 Subject: [PATCH 6/7] [wip] --- .../Utility/Test/ConfigurationTest.cpp | 2 +- src/Corrade/Utility/Test/DirectoryTest.cpp | 42 ++++++------- src/Corrade/Utility/Test/PathTest.cpp | 60 +++++++++---------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Corrade/Utility/Test/ConfigurationTest.cpp b/src/Corrade/Utility/Test/ConfigurationTest.cpp index da4054051..faac1166c 100644 --- a/src/Corrade/Utility/Test/ConfigurationTest.cpp +++ b/src/Corrade/Utility/Test/ConfigurationTest.cpp @@ -416,7 +416,7 @@ void ConfigurationTest::readonly() { void ConfigurationTest::readError() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't abuse a directory to simulate a read error."); #endif diff --git a/src/Corrade/Utility/Test/DirectoryTest.cpp b/src/Corrade/Utility/Test/DirectoryTest.cpp index 1c8e2941c..d553cdd39 100644 --- a/src/Corrade/Utility/Test/DirectoryTest.cpp +++ b/src/Corrade/Utility/Test/DirectoryTest.cpp @@ -378,7 +378,7 @@ DirectoryTest::DirectoryTest() { if(System::isSandboxed() #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) /** @todo Fix this once I persuade CMake to run XCTest tests properly */ - && std::getenv("SIMULATOR_UDID") + && std::getenv("SIMULATOR_MAINSCREEN_SCALE") #endif ) { _testDir = Directory::join(Directory::path(Directory::executableLocation()), "PathTestFiles"); @@ -575,7 +575,7 @@ void DirectoryTest::existsUtf8() { void DirectoryTest::isDirectory() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) thinks all paths are files."); #endif CORRADE_VERIFY(Directory::isDirectory(Directory::join(_testDir, "dir"))); @@ -599,7 +599,7 @@ void DirectoryTest::isDirectorySymlink() { CORRADE_EXPECT_FAIL("Symlink support is implemented on Unix systems and Emscripten only."); #endif #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) thinks all paths are files."); #endif CORRADE_VERIFY(Directory::isDirectory(Directory::join(_testDirSymlink, "dir-symlink"))); @@ -646,7 +646,7 @@ void DirectoryTest::isDirectoryNoPermission() { void DirectoryTest::isDirectoryUtf8() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) thinks all paths are files."); #endif CORRADE_VERIFY(Directory::isDirectory(Directory::join(_testDirUtf8, "šňůra"))); @@ -1144,7 +1144,7 @@ void DirectoryTest::executableLocation() { #ifdef CORRADE_TARGET_APPLE if(System::isSandboxed()) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1314,7 +1314,7 @@ void DirectoryTest::tmp() { #if defined(CORRADE_TARGET_UNIX) || defined(CORRADE_TARGET_EMSCRIPTEN) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_VERIFY(Directory::exists(dir)); @@ -1350,7 +1350,7 @@ void DirectoryTest::tmp() { /* Verify that it's possible to write stuff there */ { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif /* PathTest writes a file named 'a', and often these two tests get run @@ -1371,7 +1371,7 @@ void DirectoryTest::tmpUtf8() { void DirectoryTest::list() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1382,7 +1382,7 @@ void DirectoryTest::list() { void DirectoryTest::listSkipDirectories() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1393,7 +1393,7 @@ void DirectoryTest::listSkipDirectories() { void DirectoryTest::listSkipDirectoriesSymlinks() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1409,7 +1409,7 @@ void DirectoryTest::listSkipDirectoriesSymlinks() { void DirectoryTest::listSkipFiles() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1420,7 +1420,7 @@ void DirectoryTest::listSkipFiles() { void DirectoryTest::listSkipFilesSymlinks() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1436,7 +1436,7 @@ void DirectoryTest::listSkipFilesSymlinks() { void DirectoryTest::listSkipSpecial() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1447,7 +1447,7 @@ void DirectoryTest::listSkipSpecial() { void DirectoryTest::listSkipSpecialSymlink() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1459,7 +1459,7 @@ void DirectoryTest::listSkipSpecialSymlink() { void DirectoryTest::listSkipDotAndDotDot() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1470,7 +1470,7 @@ void DirectoryTest::listSkipDotAndDotDot() { void DirectoryTest::listSort() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1523,7 +1523,7 @@ void DirectoryTest::listUtf8() { #ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1588,7 +1588,7 @@ void DirectoryTest::fileSizeEarlyEof() { void DirectoryTest::fileSizeDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif @@ -1674,7 +1674,7 @@ void DirectoryTest::readEarlyEof() { void DirectoryTest::readDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif @@ -1945,7 +1945,7 @@ void DirectoryTest::copyEmpty() { void DirectoryTest::copyDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif @@ -2230,7 +2230,7 @@ void DirectoryTest::mapReadEmpty() { void DirectoryTest::mapReadDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif diff --git a/src/Corrade/Utility/Test/PathTest.cpp b/src/Corrade/Utility/Test/PathTest.cpp index 36822f976..d5b757aa0 100644 --- a/src/Corrade/Utility/Test/PathTest.cpp +++ b/src/Corrade/Utility/Test/PathTest.cpp @@ -455,7 +455,7 @@ PathTest::PathTest() { if(System::isSandboxed() #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) /** @todo Fix this once I persuade CMake to run XCTest tests properly */ - && std::getenv("SIMULATOR_UDID") + && std::getenv("SIMULATOR_MAINSCREEN_SCALE") #endif ) { _testDir = Path::join(Path::split(*Path::executableLocation()).first(), "PathTestFiles"); @@ -800,7 +800,7 @@ void PathTest::existsUtf8() { void PathTest::isDirectory() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDir, "dir"))); @@ -824,7 +824,7 @@ void PathTest::isDirectorySymlink() { CORRADE_EXPECT_FAIL("Symlink support is implemented on Unix systems and Emscripten only."); #endif #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDirSymlink, "dir-symlink"))); @@ -871,7 +871,7 @@ void PathTest::isDirectoryNoPermission() { void PathTest::isDirectoryNonNullTerminated() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDir, "dirX").exceptSuffix(1))); @@ -882,7 +882,7 @@ void PathTest::isDirectoryNonNullTerminated() { void PathTest::isDirectoryUtf8() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDirUtf8, "šňůra"))); @@ -1451,7 +1451,7 @@ void PathTest::executableLocation() { #ifdef CORRADE_TARGET_APPLE if(System::isSandboxed()) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1636,7 +1636,7 @@ void PathTest::temporaryDirectory() { #if defined(CORRADE_TARGET_UNIX) || defined(CORRADE_TARGET_EMSCRIPTEN) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_VERIFY(Path::exists(*temporaryDirectory)); @@ -1684,7 +1684,7 @@ void PathTest::temporaryDirectory() { /* Verify that it's possible to write stuff there */ { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_VERIFY(Path::write(Path::join(*temporaryDirectory, "a"), "hello"_s)); @@ -1706,7 +1706,7 @@ void PathTest::list() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1733,7 +1733,7 @@ void PathTest::listIterateRangeFor() { arrayAppend(out, a); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(out, Containers::array({ @@ -1754,7 +1754,7 @@ void PathTest::listEmptyDirectory() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1769,7 +1769,7 @@ void PathTest::listSkipDirectories() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1784,7 +1784,7 @@ void PathTest::listSkipDirectoriesSymlinks() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif #if !defined(CORRADE_TARGET_UNIX) && !defined(CORRADE_TARGET_EMSCRIPTEN) @@ -1804,7 +1804,7 @@ void PathTest::listSkipFiles() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1819,7 +1819,7 @@ void PathTest::listSkipFilesSymlinks() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif #if !defined(CORRADE_TARGET_UNIX) && !defined(CORRADE_TARGET_EMSCRIPTEN) @@ -1839,7 +1839,7 @@ void PathTest::listSkipSpecial() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1856,7 +1856,7 @@ void PathTest::listSkipSpecialSymlink() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1871,7 +1871,7 @@ void PathTest::listSkipDotAndDotDot() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1886,7 +1886,7 @@ void PathTest::listSkipEverything() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1900,7 +1900,7 @@ void PathTest::listSort() { CORRADE_VERIFY(list); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1911,7 +1911,7 @@ void PathTest::listSort() { CORRADE_VERIFY(list); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1923,7 +1923,7 @@ void PathTest::listSort() { CORRADE_VERIFY(list); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1959,7 +1959,7 @@ void PathTest::listNonNullTerminated() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1975,7 +1975,7 @@ void PathTest::listTrailingSlash() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -2002,7 +2002,7 @@ void PathTest::listUtf8Result() { #ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -2028,7 +2028,7 @@ void PathTest::listUtf8Path() { CORRADE_VERIFY(actual); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_UDID"), + CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*actual, @@ -2086,7 +2086,7 @@ void PathTest::sizeEarlyEof() { void PathTest::sizeDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif @@ -2255,7 +2255,7 @@ void PathTest::readEarlyEofString() { void PathTest::readDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif @@ -2635,7 +2635,7 @@ void PathTest::copyEmpty() { void PathTest::copyDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif @@ -2974,7 +2974,7 @@ void PathTest::mapReadEmpty() { void PathTest::mapReadDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_UDID")) + if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif From 13e804c5580d977ef88d18bde9a8c386f567a94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 15 Aug 2023 11:53:25 +0200 Subject: [PATCH 7/7] [wip] --- .../Utility/Test/ConfigurationTest.cpp | 2 +- src/Corrade/Utility/Test/DirectoryTest.cpp | 42 ++++++------- src/Corrade/Utility/Test/PathTest.cpp | 60 +++++++++---------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Corrade/Utility/Test/ConfigurationTest.cpp b/src/Corrade/Utility/Test/ConfigurationTest.cpp index faac1166c..8169d5741 100644 --- a/src/Corrade/Utility/Test/ConfigurationTest.cpp +++ b/src/Corrade/Utility/Test/ConfigurationTest.cpp @@ -416,7 +416,7 @@ void ConfigurationTest::readonly() { void ConfigurationTest::readError() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't abuse a directory to simulate a read error."); #endif diff --git a/src/Corrade/Utility/Test/DirectoryTest.cpp b/src/Corrade/Utility/Test/DirectoryTest.cpp index d553cdd39..42bc19ad8 100644 --- a/src/Corrade/Utility/Test/DirectoryTest.cpp +++ b/src/Corrade/Utility/Test/DirectoryTest.cpp @@ -378,7 +378,7 @@ DirectoryTest::DirectoryTest() { if(System::isSandboxed() #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) /** @todo Fix this once I persuade CMake to run XCTest tests properly */ - && std::getenv("SIMULATOR_MAINSCREEN_SCALE") + && !std::getenv("SIMULATOR_MAINSCREEN_SCALE") #endif ) { _testDir = Directory::join(Directory::path(Directory::executableLocation()), "PathTestFiles"); @@ -575,7 +575,7 @@ void DirectoryTest::existsUtf8() { void DirectoryTest::isDirectory() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) thinks all paths are files."); #endif CORRADE_VERIFY(Directory::isDirectory(Directory::join(_testDir, "dir"))); @@ -599,7 +599,7 @@ void DirectoryTest::isDirectorySymlink() { CORRADE_EXPECT_FAIL("Symlink support is implemented on Unix systems and Emscripten only."); #endif #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) thinks all paths are files."); #endif CORRADE_VERIFY(Directory::isDirectory(Directory::join(_testDirSymlink, "dir-symlink"))); @@ -646,7 +646,7 @@ void DirectoryTest::isDirectoryNoPermission() { void DirectoryTest::isDirectoryUtf8() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) thinks all paths are files."); #endif CORRADE_VERIFY(Directory::isDirectory(Directory::join(_testDirUtf8, "šňůra"))); @@ -1144,7 +1144,7 @@ void DirectoryTest::executableLocation() { #ifdef CORRADE_TARGET_APPLE if(System::isSandboxed()) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1314,7 +1314,7 @@ void DirectoryTest::tmp() { #if defined(CORRADE_TARGET_UNIX) || defined(CORRADE_TARGET_EMSCRIPTEN) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_VERIFY(Directory::exists(dir)); @@ -1350,7 +1350,7 @@ void DirectoryTest::tmp() { /* Verify that it's possible to write stuff there */ { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif /* PathTest writes a file named 'a', and often these two tests get run @@ -1371,7 +1371,7 @@ void DirectoryTest::tmpUtf8() { void DirectoryTest::list() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1382,7 +1382,7 @@ void DirectoryTest::list() { void DirectoryTest::listSkipDirectories() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1393,7 +1393,7 @@ void DirectoryTest::listSkipDirectories() { void DirectoryTest::listSkipDirectoriesSymlinks() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1409,7 +1409,7 @@ void DirectoryTest::listSkipDirectoriesSymlinks() { void DirectoryTest::listSkipFiles() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1420,7 +1420,7 @@ void DirectoryTest::listSkipFiles() { void DirectoryTest::listSkipFilesSymlinks() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1436,7 +1436,7 @@ void DirectoryTest::listSkipFilesSymlinks() { void DirectoryTest::listSkipSpecial() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1447,7 +1447,7 @@ void DirectoryTest::listSkipSpecial() { void DirectoryTest::listSkipSpecialSymlink() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1459,7 +1459,7 @@ void DirectoryTest::listSkipSpecialSymlink() { void DirectoryTest::listSkipDotAndDotDot() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1470,7 +1470,7 @@ void DirectoryTest::listSkipDotAndDotDot() { void DirectoryTest::listSort() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1523,7 +1523,7 @@ void DirectoryTest::listUtf8() { #ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1588,7 +1588,7 @@ void DirectoryTest::fileSizeEarlyEof() { void DirectoryTest::fileSizeDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif @@ -1674,7 +1674,7 @@ void DirectoryTest::readEarlyEof() { void DirectoryTest::readDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif @@ -1945,7 +1945,7 @@ void DirectoryTest::copyEmpty() { void DirectoryTest::copyDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif @@ -2230,7 +2230,7 @@ void DirectoryTest::mapReadEmpty() { void DirectoryTest::mapReadDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) thinks all paths are files, can't test."); #endif diff --git a/src/Corrade/Utility/Test/PathTest.cpp b/src/Corrade/Utility/Test/PathTest.cpp index d5b757aa0..2f075d78d 100644 --- a/src/Corrade/Utility/Test/PathTest.cpp +++ b/src/Corrade/Utility/Test/PathTest.cpp @@ -455,7 +455,7 @@ PathTest::PathTest() { if(System::isSandboxed() #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) /** @todo Fix this once I persuade CMake to run XCTest tests properly */ - && std::getenv("SIMULATOR_MAINSCREEN_SCALE") + && !std::getenv("SIMULATOR_MAINSCREEN_SCALE") #endif ) { _testDir = Path::join(Path::split(*Path::executableLocation()).first(), "PathTestFiles"); @@ -800,7 +800,7 @@ void PathTest::existsUtf8() { void PathTest::isDirectory() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDir, "dir"))); @@ -824,7 +824,7 @@ void PathTest::isDirectorySymlink() { CORRADE_EXPECT_FAIL("Symlink support is implemented on Unix systems and Emscripten only."); #endif #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDirSymlink, "dir-symlink"))); @@ -871,7 +871,7 @@ void PathTest::isDirectoryNoPermission() { void PathTest::isDirectoryNonNullTerminated() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDir, "dirX").exceptSuffix(1))); @@ -882,7 +882,7 @@ void PathTest::isDirectoryNonNullTerminated() { void PathTest::isDirectoryUtf8() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "iOS (in a simulator) has no idea about file types."); #endif CORRADE_VERIFY(Path::isDirectory(Path::join(_testDirUtf8, "šňůra"))); @@ -1451,7 +1451,7 @@ void PathTest::executableLocation() { #ifdef CORRADE_TARGET_APPLE if(System::isSandboxed()) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -1636,7 +1636,7 @@ void PathTest::temporaryDirectory() { #if defined(CORRADE_TARGET_UNIX) || defined(CORRADE_TARGET_EMSCRIPTEN) { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_VERIFY(Path::exists(*temporaryDirectory)); @@ -1684,7 +1684,7 @@ void PathTest::temporaryDirectory() { /* Verify that it's possible to write stuff there */ { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_VERIFY(Path::write(Path::join(*temporaryDirectory, "a"), "hello"_s)); @@ -1706,7 +1706,7 @@ void PathTest::list() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1733,7 +1733,7 @@ void PathTest::listIterateRangeFor() { arrayAppend(out, a); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(out, Containers::array({ @@ -1754,7 +1754,7 @@ void PathTest::listEmptyDirectory() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1769,7 +1769,7 @@ void PathTest::listSkipDirectories() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1784,7 +1784,7 @@ void PathTest::listSkipDirectoriesSymlinks() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif #if !defined(CORRADE_TARGET_UNIX) && !defined(CORRADE_TARGET_EMSCRIPTEN) @@ -1804,7 +1804,7 @@ void PathTest::listSkipFiles() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1819,7 +1819,7 @@ void PathTest::listSkipFilesSymlinks() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif #if !defined(CORRADE_TARGET_UNIX) && !defined(CORRADE_TARGET_EMSCRIPTEN) @@ -1839,7 +1839,7 @@ void PathTest::listSkipSpecial() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1856,7 +1856,7 @@ void PathTest::listSkipSpecialSymlink() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1871,7 +1871,7 @@ void PathTest::listSkipDotAndDotDot() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1886,7 +1886,7 @@ void PathTest::listSkipEverything() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1900,7 +1900,7 @@ void PathTest::listSort() { CORRADE_VERIFY(list); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1911,7 +1911,7 @@ void PathTest::listSort() { CORRADE_VERIFY(list); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1923,7 +1923,7 @@ void PathTest::listSort() { CORRADE_VERIFY(list); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1959,7 +1959,7 @@ void PathTest::listNonNullTerminated() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -1975,7 +1975,7 @@ void PathTest::listTrailingSlash() { { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*list, Containers::array({ @@ -2002,7 +2002,7 @@ void PathTest::listUtf8Result() { #ifdef CORRADE_TARGET_APPLE #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif @@ -2028,7 +2028,7 @@ void PathTest::listUtf8Path() { CORRADE_VERIFY(actual); #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - CORRADE_EXPECT_FAIL_IF(!std::getenv("SIMULATOR_MAINSCREEN_SCALE"), + CORRADE_EXPECT_FAIL_IF(std::getenv("SIMULATOR_MAINSCREEN_SCALE"), "CTest is not able to run XCTest executables properly in the simulator."); #endif CORRADE_COMPARE_AS(*actual, @@ -2086,7 +2086,7 @@ void PathTest::sizeEarlyEof() { void PathTest::sizeDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif @@ -2255,7 +2255,7 @@ void PathTest::readEarlyEofString() { void PathTest::readDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif @@ -2635,7 +2635,7 @@ void PathTest::copyEmpty() { void PathTest::copyDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif @@ -2974,7 +2974,7 @@ void PathTest::mapReadEmpty() { void PathTest::mapReadDirectory() { #if defined(CORRADE_TARGET_IOS) && defined(CORRADE_TESTSUITE_TARGET_XCTEST) - if(!std::getenv("SIMULATOR_MAINSCREEN_SCALE")) + if(std::getenv("SIMULATOR_MAINSCREEN_SCALE")) CORRADE_SKIP("iOS (in a simulator) has no idea about file types, can't test."); #endif