Revert "Apple Silicon disable failing PAL tests (#48782)"

This reverts commit 03d414b.
dotnet · Feb 26, 2021 · 144d483 · 144d483
1 parent 763770d
commit 144d483
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 23 deletions.
diff --git a/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp b/src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
@@ -68,13 +68,6 @@ void sigsegv_handler(int code, siginfo_t *siginfo, void *context)
 
 int main(int argc, char *argv[])
 {
-#if defined(TARGET_OSX) && defined(TARGET_ARM64)
-    // Helix and/or build error...
-    // dyld: Library not loaded: libpaltest_pal_sxs_test1_dll1.dylib
-    printf("paltest_pal_sxs_test1 has been disabled on this platform\n");
-
-    return PASS;
-#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
     struct sigaction newAction;
     struct sigaction oldAction;
     newAction.sa_flags = SA_SIGINFO | SA_RESTART;
@@ -120,5 +113,4 @@ int main(int argc, char *argv[])
 
     printf("ERROR: code was executed after the access violation.\n");
     return FAIL;
-#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
 }
diff --git a/src/coreclr/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp b/src/coreclr/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp
@@ -120,10 +120,6 @@ BOOL readTest_ReadFile_test2(DWORD dwByteCount, char cResult)
 
 PALTEST(file_io_ReadFile_test2_paltest_readfile_test2, "file_io/ReadFile/test2/paltest_readfile_test2")
 {
-#if defined(TARGET_OSX) && defined(TARGET_ARM64)
-    // Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages.
-    printf("file_io_ReadFile_test2_paltest_readfile_test2 has been disabled on this platform\n");
-#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
     HANDLE hFile = NULL;
     const int BUFFER_SIZE = 2 * PAGESIZE;
 
@@ -191,7 +187,6 @@ PALTEST(file_io_ReadFile_test2_paltest_readfile_test2, "file_io/ReadFile/test2/p
 
 	VirtualFree(readBuffer_ReadFile_test2, BUFFER_SIZE, MEM_RELEASE);
     PAL_Terminate();
-#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
     return PASS;
 }
 
diff --git a/src/coreclr/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp b/src/coreclr/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp
@@ -28,10 +28,6 @@ PALTEST(filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4, "f
         ExitProcess(FAIL);
     }
 
-#if defined(TARGET_OSX) && defined(TARGET_ARM64)
-    // AppleSilcon does not allow mapping general pages as RWX
-    printf("filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4 has been disabled on this platform\n");
-#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
     //Allocate the physical storage in memory or in the paging file on disk 
     lpVirtualAddress = VirtualAlloc(NULL,//determine where to allocate the region
             REGIONSIZE,      //specify the size
@@ -65,7 +61,6 @@ PALTEST(filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4, "f
     {
         Fail("\nFailed to call VirtualFree API!\n");
     }
-#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
 
     PAL_Terminate();
     return PASS;

diff --git a/src/coreclr/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp b/src/coreclr/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp
@@ -17,10 +17,6 @@
 
 PALTEST(miscellaneous_queryperformancecounter_test1_paltest_queryperformancecounter_test1, "miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1")
 {
-#if defined(TARGET_OSX) && defined(TARGET_ARM64)
-    // We are see > 100 ms of average error on this platform
-    printf("miscellaneous_queryperformancecounter_test1_paltest_queryperformancecounter_test1 has been disabled on this platform\n");
-#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
     /* Milliseconds of error which are acceptable Function execution time, etc.
     FreeBSD has a "standard" resolution of 50ms for waiting operations, so we
     must take that into account as well */
@@ -104,7 +100,6 @@ PALTEST(miscellaneous_queryperformancecounter_test1_paltest_queryperformancecoun
     /* Terminate the PAL.
      */  
     PAL_Terminate();
-#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
     return PASS;
 }