Imported Upstream version 1.0.0.9910upstream/1.0.0.9910

15 files changed, 14 insertions, 49 deletions

diff --git a/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt
index b336c03d37..276d9a47ce 100644
--- a/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_event_nonshared
 add_dependencies(paltest_event_nonshared coreclrpal)
 
 target_link_libraries(paltest_event_nonshared
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )
diff --git a/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt
index 86188796bd..92ad5b0c1b 100644
--- a/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_event_shared
 add_dependencies(paltest_event_shared coreclrpal)
 
 target_link_libraries(paltest_event_shared
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt
index 03d5efac27..8ddce815dc 100644
--- a/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_mutex_nonshared
 add_dependencies(paltest_mutex_nonshared coreclrpal)
 
 target_link_libraries(paltest_mutex_nonshared
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt
index d4b50cd66e..0436f263fd 100644
--- a/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_mutex_shared
 add_dependencies(paltest_mutex_shared coreclrpal)
 
 target_link_libraries(paltest_mutex_shared
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt
index 9ed4535d39..f17c6737bc 100644
--- a/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_semaphore_nonshared
 add_dependencies(paltest_semaphore_nonshared coreclrpal)
 
 target_link_libraries(paltest_semaphore_nonshared
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt
index 5c7f93290f..24327bea4c 100644
--- a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_semaphore_shared
 add_dependencies(paltest_semaphore_shared coreclrpal)
 
 target_link_libraries(paltest_semaphore_shared
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp
index deb8252b70..d3cfa762bb 100644
--- a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp
+++ b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp
@@ -129,8 +129,6 @@ make the most sense to just skip the named semaphore test on Windows
 - from an object management perspective it doesn't really gain 
 us anything over what we already have."
 */
-#ifdef PLATFORM_UNIX
-
     ZeroMemory( objectSuffix, MAX_PATH );
 
     if(GetParameters(argc, argv))
@@ -272,7 +270,6 @@ us anything over what we already have."
         Trace("Test Failed\n");
     }
 
-#endif //PLATFORM_UNIX
     PAL_Terminate();
     return testReturnCode;
 }
diff --git a/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt
index fc357ed258..e6b6b0c805 100644
--- a/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt
@@ -14,7 +14,5 @@ add_executable(paltest_synchronization_criticalsection
 add_dependencies(paltest_synchronization_criticalsection coreclrpal)
 
 target_link_libraries(paltest_synchronization_criticalsection
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt
index 9a02993916..5a2a503137 100644
--- a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt
@@ -15,7 +15,5 @@ add_executable(paltest_synchronization_nativecriticalsection
 add_dependencies(paltest_synchronization_nativecriticalsection coreclrpal)
 
 target_link_libraries(paltest_synchronization_nativecriticalsection
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp
index 40efacd7c9..0ccd5c9419 100644
--- a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp
+++ b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp
@@ -445,13 +445,9 @@ ULONGLONG GetTicks(void)
     asm volatile("rdtsc":"=a" (a), "=d" (d));
     return ((ULONGLONG)((unsigned int)(d)) << 32) | (unsigned int)(a);
 #else
-#if defined(__sparc__) || (defined (_HPUX_) && defined(__ia64__))
-    return (ULONGLONG)gethrtime();
-#else
     // #error Don''t know how to get ticks on this platform
     return (ULONGLONG)gethrtime();
-#endif // __sparc__
-#endif // _X86_
+#endif // i386
 }
 
 
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt
index 717bdd6b20..b942096363 100644
--- a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt
@@ -16,7 +16,5 @@ add_executable(paltest_synchronization_nativecs_interlocked
 add_dependencies(paltest_synchronization_nativecs_interlocked coreclrpal)
 
 target_link_libraries(paltest_synchronization_nativecs_interlocked
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp
index 4c19d3b0de..ec5c1c365f 100644
--- a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp
+++ b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp
@@ -449,13 +449,9 @@ ULONGLONG GetTicks(void)
     asm volatile("rdtsc":"=a" (a), "=d" (d));
     return ((ULONGLONG)((unsigned int)(d)) << 32) | (unsigned int)(a);
 #else
-#if defined(__sparc__) || (defined (_HPUX_) && defined(__ia64__))
-    return (ULONGLONG)gethrtime();
-#else
     // #error Don''t know how to get ticks on this platform
     return (ULONGLONG)gethrtime();
-#endif // __sparc__
-#endif // _X86_
+#endif // i386
 }
 
 
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt b/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt
index d396d2fc49..a01fbd6552 100644
--- a/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt
@@ -14,7 +14,5 @@ add_executable(paltest_threading_threadsuspension
 add_dependencies(paltest_threading_threadsuspension coreclrpal)
 
 target_link_libraries(paltest_threading_threadsuspension
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt b/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt
index 2c880921fe..c3fb807148 100644
--- a/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt
@@ -14,7 +14,5 @@ add_executable(paltest_threading_threadsuspension_switchthread
 add_dependencies(paltest_threading_threadsuspension_switchthread coreclrpal)
 
 target_link_libraries(paltest_threading_threadsuspension_switchthread
-  pthread
-  m
-  coreclrpal
+  ${COMMON_TEST_LIBRARIES}
 )
diff --git a/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt b/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt
index 5e103102af..3f497d76c2 100644
--- a/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt
@@ -14,8 +14,6 @@ add_executable(paltest_composite_wfmo
 add_dependencies(paltest_composite_wfmo coreclrpal)
 
 target_link_libraries(paltest_composite_wfmo
-  pthread
+  ${COMMON_TEST_LIBRARIES}
   rt
-  m
-  coreclrpal
 )