From 4b11dc566a5bbfa1378d6266525c281b028abcc8 Mon Sep 17 00:00:00 2001 From: Jiyoung Yun Date: Fri, 10 Feb 2017 20:35:12 +0900 Subject: Imported Upstream version 1.0.0.9910 --- src/pal/CMakeLists.txt | 2 +- src/pal/inc/mbusafecrt.h | 2 +- src/pal/inc/pal.h | 878 +------------------ src/pal/inc/pal_char16.h | 5 +- src/pal/inc/pal_mstypes.h | 10 - src/pal/inc/rt/intsafe.h | 44 +- src/pal/inc/rt/palrt.h | 51 +- src/pal/inc/rt/safecrt.h | 8 - src/pal/inc/rt/sal.h | 2 +- src/pal/inc/rt/specstrings_strict.h | 2 +- src/pal/inc/rt/specstrings_undef.h | 2 +- src/pal/inc/rt/vsassert.h | 5 - src/pal/inc/strsafe.h | 593 ------------- src/pal/inc/unixasmmacrosarm64.inc | 3 +- src/pal/src/CMakeLists.txt | 111 ++- src/pal/src/arch/amd64/processor.cpp | 16 +- src/pal/src/arch/i386/context2.S | 47 +- src/pal/src/config.h.in | 1 + src/pal/src/configure.cmake | 33 +- src/pal/src/cruntime/file.cpp | 78 -- src/pal/src/cruntime/math.cpp | 8 - src/pal/src/cruntime/printf.cpp | 82 -- src/pal/src/cruntime/printfcpp.cpp | 940 +++------------------ src/pal/src/cruntime/silent_printf.cpp | 280 ------ src/pal/src/cruntime/string.cpp | 2 +- src/pal/src/debug/debug.cpp | 304 ++----- src/pal/src/exception/machexception.h | 2 - src/pal/src/exception/seh-unwind.cpp | 4 +- src/pal/src/exception/signal.hpp | 7 - src/pal/src/file/disk.cpp | 3 - src/pal/src/file/file.cpp | 9 +- src/pal/src/file/path.cpp | 4 +- src/pal/src/include/pal/modulename.h | 3 - src/pal/src/include/pal/palinternal.h | 20 +- src/pal/src/include/pal/printfcpp.hpp | 55 -- src/pal/src/include/pal/sharedmemory.h | 21 +- src/pal/src/include/pal/thread.hpp | 18 - src/pal/src/include/pal/threadsusp.hpp | 2 + src/pal/src/include/pal/utils.h | 56 ++ src/pal/src/include/pal/virtual.h | 5 - src/pal/src/init/pal.cpp | 17 +- src/pal/src/loader/module.cpp | 6 +- src/pal/src/loader/modulename.cpp | 134 --- src/pal/src/misc/dbgmsg.cpp | 10 +- src/pal/src/misc/fmtmessage.cpp | 3 +- src/pal/src/misc/perftrace.cpp | 179 +--- src/pal/src/misc/sysinfo.cpp | 18 +- src/pal/src/misc/utils.cpp | 6 +- src/pal/src/safecrt/cruntime.h | 14 +- src/pal/src/safecrt/sscanf_s.cpp | 6 +- src/pal/src/safecrt/wcslen_s.cpp | 2 +- src/pal/src/shmemory/shmemory.cpp | 54 +- src/pal/src/thread/process.cpp | 24 +- src/pal/src/thread/thread.cpp | 108 +-- src/pal/src/thread/threadsusp.cpp | 10 - src/pal/tests/palsuite/CMakeLists.txt | 10 + src/pal/tests/palsuite/c_runtime/CMakeLists.txt | 4 +- .../c_runtime/__iscsym/test1/CMakeLists.txt | 4 +- .../c_runtime/_alloca/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_ecvt/test1/CMakeLists.txt | 4 +- .../c_runtime/_fdopen/test1/CMakeLists.txt | 4 +- .../c_runtime/_finite/test1/CMakeLists.txt | 4 +- .../c_runtime/_finitef/test1/CMakeLists.txt | 4 +- .../c_runtime/_fullpath/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_gcvt/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_gcvt/test2/CMakeLists.txt | 4 +- .../tests/palsuite/c_runtime/_getw/CMakeLists.txt | 4 - .../palsuite/c_runtime/_getw/test1/CMakeLists.txt | 19 - .../tests/palsuite/c_runtime/_getw/test1/test.dat | Bin 28 -> 0 bytes .../tests/palsuite/c_runtime/_getw/test1/test1.cpp | 96 --- .../palsuite/c_runtime/_getw/test1/testinfo.dat | 15 - .../palsuite/c_runtime/_isnan/test1/CMakeLists.txt | 4 +- .../c_runtime/_isnanf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_itow/test1/CMakeLists.txt | 4 +- .../c_runtime/_mbsdec/test1/CMakeLists.txt | 4 +- .../c_runtime/_mbsinc/test1/CMakeLists.txt | 4 +- .../c_runtime/_mbsninc/test1/CMakeLists.txt | 4 +- .../c_runtime/_open_osfhandle/test1/CMakeLists.txt | 4 +- .../c_runtime/_open_osfhandle/test2/CMakeLists.txt | 4 +- .../c_runtime/_putenv/test1/CMakeLists.txt | 4 +- .../c_runtime/_putenv/test2/CMakeLists.txt | 4 +- .../c_runtime/_putenv/test3/CMakeLists.txt | 4 +- .../c_runtime/_putenv/test4/CMakeLists.txt | 4 +- .../tests/palsuite/c_runtime/_putw/CMakeLists.txt | 4 - .../palsuite/c_runtime/_putw/test1/CMakeLists.txt | 19 - .../tests/palsuite/c_runtime/_putw/test1/test1.cpp | 112 --- .../palsuite/c_runtime/_putw/test1/testinfo.dat | 13 - .../palsuite/c_runtime/_rotl/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_rotr/test1/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test1/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test10/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test11/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test12/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test13/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test14/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test15/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test16/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test17/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test18/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test19/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_snprintf_s/test2/test2.cpp | 6 + .../c_runtime/_snprintf_s/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_snprintf_s/test3/test3.cpp | 6 + .../c_runtime/_snprintf_s/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_snprintf_s/test4/test4.cpp | 4 +- .../c_runtime/_snprintf_s/test6/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test7/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test8/CMakeLists.txt | 4 +- .../c_runtime/_snprintf_s/test9/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test1/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test10/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test11/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test12/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test13/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test14/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test15/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test16/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test17/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test18/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test19/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test2/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test2/test2.cpp | 6 + .../c_runtime/_snwprintf_s/test3/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test3/test3.cpp | 6 + .../c_runtime/_snwprintf_s/test4/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test4/test4.cpp | 2 +- .../c_runtime/_snwprintf_s/test6/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test7/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test8/CMakeLists.txt | 4 +- .../c_runtime/_snwprintf_s/test9/CMakeLists.txt | 4 +- .../c_runtime/_stricmp/test1/CMakeLists.txt | 4 +- .../c_runtime/_strlwr/test1/CMakeLists.txt | 4 +- .../c_runtime/_strnicmp/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_vsnprintf/CMakeLists.txt | 22 - .../palsuite/c_runtime/_vsnprintf/_vsnprintf.h | 124 --- .../c_runtime/_vsnprintf/test1/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test1/test1.cpp | 55 -- .../c_runtime/_vsnprintf/test1/testinfo.dat | 13 - .../c_runtime/_vsnprintf/test10/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test10/test10.cpp | 50 -- .../c_runtime/_vsnprintf/test10/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test11/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test11/test11.cpp | 50 -- .../c_runtime/_vsnprintf/test11/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test12/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test12/test12.cpp | 52 -- .../c_runtime/_vsnprintf/test12/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test13/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test13/test13.cpp | 52 -- .../c_runtime/_vsnprintf/test13/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test14/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test14/test14.cpp | 50 -- .../c_runtime/_vsnprintf/test14/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test15/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test15/test15.cpp | 49 -- .../c_runtime/_vsnprintf/test15/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test16/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test16/test16.cpp | 49 -- .../c_runtime/_vsnprintf/test16/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test17/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test17/test17.cpp | 50 -- .../c_runtime/_vsnprintf/test17/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test18/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test18/test18.cpp | 50 -- .../c_runtime/_vsnprintf/test18/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test19/CMakeLists.txt | 19 - .../c_runtime/_vsnprintf/test19/test19.cpp | 103 --- .../c_runtime/_vsnprintf/test19/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test2/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test2/test2.cpp | 44 - .../c_runtime/_vsnprintf/test2/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test3/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test3/test3.cpp | 43 - .../c_runtime/_vsnprintf/test3/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test4/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test4/test4.cpp | 98 --- .../c_runtime/_vsnprintf/test4/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test5/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test5/test5.cpp | 78 -- .../c_runtime/_vsnprintf/test5/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test6/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test6/test6.cpp | 44 - .../c_runtime/_vsnprintf/test6/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test7/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test7/test7.cpp | 44 - .../c_runtime/_vsnprintf/test7/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test8/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test8/test8.cpp | 52 -- .../c_runtime/_vsnprintf/test8/testinfo.dat | 14 - .../c_runtime/_vsnprintf/test9/CMakeLists.txt | 19 - .../palsuite/c_runtime/_vsnprintf/test9/test9.cpp | 51 -- .../c_runtime/_vsnprintf/test9/testinfo.dat | 14 - .../palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt | 21 + .../palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h | 124 +++ .../c_runtime/_vsnprintf_s/test1/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test1/test1.cpp | 55 ++ .../c_runtime/_vsnprintf_s/test1/testinfo.dat | 13 + .../c_runtime/_vsnprintf_s/test10/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test10/test10.cpp | 50 ++ .../c_runtime/_vsnprintf_s/test10/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test11/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test11/test11.cpp | 50 ++ .../c_runtime/_vsnprintf_s/test11/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test12/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test12/test12.cpp | 52 ++ .../c_runtime/_vsnprintf_s/test12/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test13/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test13/test13.cpp | 52 ++ .../c_runtime/_vsnprintf_s/test13/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test14/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test14/test14.cpp | 50 ++ .../c_runtime/_vsnprintf_s/test14/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test15/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test15/test15.cpp | 49 ++ .../c_runtime/_vsnprintf_s/test15/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test16/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test16/test16.cpp | 49 ++ .../c_runtime/_vsnprintf_s/test16/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test17/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test17/test17.cpp | 50 ++ .../c_runtime/_vsnprintf_s/test17/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test18/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test18/test18.cpp | 50 ++ .../c_runtime/_vsnprintf_s/test18/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test19/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test19/test19.cpp | 103 +++ .../c_runtime/_vsnprintf_s/test19/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test2/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test2/test2.cpp | 50 ++ .../c_runtime/_vsnprintf_s/test2/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test3/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test3/test3.cpp | 49 ++ .../c_runtime/_vsnprintf_s/test3/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test4/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test4/test4.cpp | 98 +++ .../c_runtime/_vsnprintf_s/test4/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test6/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test6/test6.cpp | 44 + .../c_runtime/_vsnprintf_s/test6/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test7/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test7/test7.cpp | 44 + .../c_runtime/_vsnprintf_s/test7/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test8/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test8/test8.cpp | 52 ++ .../c_runtime/_vsnprintf_s/test8/testinfo.dat | 14 + .../c_runtime/_vsnprintf_s/test9/CMakeLists.txt | 17 + .../c_runtime/_vsnprintf_s/test9/test9.cpp | 51 ++ .../c_runtime/_vsnprintf_s/test9/testinfo.dat | 14 + .../c_runtime/_vsnwprintf_s/test1/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test10/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test11/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test12/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test13/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test14/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test15/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test16/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test17/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test18/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test19/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test2/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test2/test2.cpp | 6 + .../c_runtime/_vsnwprintf_s/test3/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test3/test3.cpp | 6 + .../c_runtime/_vsnwprintf_s/test4/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test4/test4.cpp | 2 +- .../c_runtime/_vsnwprintf_s/test6/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test7/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test8/CMakeLists.txt | 4 +- .../c_runtime/_vsnwprintf_s/test9/CMakeLists.txt | 4 +- .../c_runtime/_wcsicmp/test1/CMakeLists.txt | 4 +- .../c_runtime/_wcslwr/test1/CMakeLists.txt | 4 +- .../c_runtime/_wcsnicmp/test1/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test1/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test2/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test3/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test4/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test5/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test6/CMakeLists.txt | 4 +- .../c_runtime/_wfopen/test7/CMakeLists.txt | 4 +- .../palsuite/c_runtime/_wtoi/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/abs/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/acos/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/acosf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/asin/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/asinf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atan/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atan2/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atan2f/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atanf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atof/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atoi/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/atol/test1/CMakeLists.txt | 4 +- .../c_runtime/bsearch/test1/CMakeLists.txt | 4 +- .../c_runtime/bsearch/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ceil/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ceilf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/cos/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/cosf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/cosh/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/coshf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ctime/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/errno/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/errno/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/exit/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/exit/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/exp/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/expf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fabs/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fabsf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fclose/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fclose/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/feof/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ferror/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ferror/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fflush/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fgets/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fgets/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fgets/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/floor/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/floorf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fmod/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fmodf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test5/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test6/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fopen/test7/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test1/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test19/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fprintf/test2/test2.cpp | 6 + .../c_runtime/fprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fprintf/test3/test3.cpp | 6 + .../c_runtime/fprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fprintf/test4/test4.cpp | 2 +- .../c_runtime/fprintf/test5/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/fprintf/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fputs/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fputs/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fread/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fread/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fread/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/free/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fseek/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ftell/test1/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test1/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test19/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fwprintf/test2/test2.cpp | 6 + .../c_runtime/fwprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fwprintf/test3/test3.cpp | 6 + .../c_runtime/fwprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fwprintf/test4/test4.cpp | 2 +- .../c_runtime/fwprintf/test5/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/fwprintf/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/fwrite/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/getc/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/getenv/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/getenv/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/getenv/test3/CMakeLists.txt | 4 +- .../c_runtime/isalnum/test1/CMakeLists.txt | 4 +- .../c_runtime/isalpha/test1/CMakeLists.txt | 4 +- .../c_runtime/isdigit/test1/CMakeLists.txt | 4 +- .../c_runtime/islower/test1/CMakeLists.txt | 4 +- .../c_runtime/isprint/test1/CMakeLists.txt | 4 +- .../c_runtime/isprint/test2/CMakeLists.txt | 4 +- .../c_runtime/isspace/test1/CMakeLists.txt | 4 +- .../c_runtime/isupper/test1/CMakeLists.txt | 4 +- .../c_runtime/iswdigit/test1/CMakeLists.txt | 4 +- .../c_runtime/iswprint/test1/CMakeLists.txt | 4 +- .../c_runtime/iswspace/test1/CMakeLists.txt | 4 +- .../c_runtime/iswupper/test1/CMakeLists.txt | 4 +- .../c_runtime/iswxdigit/test1/CMakeLists.txt | 4 +- .../c_runtime/isxdigit/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/labs/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/llabs/test1/CMakeLists.txt | 4 +- .../c_runtime/localtime/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/log/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/log10/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/log10f/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/logf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/malloc/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/malloc/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/memchr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/memcmp/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/memcpy/test1/CMakeLists.txt | 4 +- .../c_runtime/memmove/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/memset/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/modf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/modff/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/pow/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/powf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test1/CMakeLists.txt | 4 +- .../c_runtime/printf/test10/CMakeLists.txt | 4 +- .../c_runtime/printf/test11/CMakeLists.txt | 4 +- .../c_runtime/printf/test12/CMakeLists.txt | 4 +- .../c_runtime/printf/test13/CMakeLists.txt | 4 +- .../c_runtime/printf/test14/CMakeLists.txt | 4 +- .../c_runtime/printf/test15/CMakeLists.txt | 4 +- .../c_runtime/printf/test16/CMakeLists.txt | 4 +- .../c_runtime/printf/test17/CMakeLists.txt | 4 +- .../c_runtime/printf/test18/CMakeLists.txt | 4 +- .../c_runtime/printf/test19/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test2/test2.cpp | 6 + .../palsuite/c_runtime/printf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test3/test3.cpp | 6 + .../palsuite/c_runtime/printf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test4/test4.cpp | 2 +- .../palsuite/c_runtime/printf/test5/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test6/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test7/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test8/CMakeLists.txt | 4 +- .../palsuite/c_runtime/printf/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/qsort/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/qsort/test2/CMakeLists.txt | 4 +- .../c_runtime/rand_srand/test1/CMakeLists.txt | 4 +- .../c_runtime/realloc/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sin/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sinf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sinh/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sinhf/test1/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test1/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test10/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test11/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test12/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test13/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test14/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test15/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test16/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test17/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test18/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test19/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sprintf_s/test2/test2.cpp | 6 + .../c_runtime/sprintf_s/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sprintf_s/test3/test3.cpp | 6 + .../c_runtime/sprintf_s/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sprintf_s/test4/test4.cpp | 2 +- .../c_runtime/sprintf_s/test6/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test7/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test8/CMakeLists.txt | 4 +- .../c_runtime/sprintf_s/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sqrt/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/sqrtf/test1/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test1/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test10/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test11/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test12/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test13/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test14/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test15/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test16/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test17/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test2/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test3/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test4/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test5/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test6/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test7/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test8/CMakeLists.txt | 4 +- .../c_runtime/sscanf_s/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strcat/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strchr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strcmp/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strcpy/test1/CMakeLists.txt | 4 +- .../c_runtime/strcspn/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strlen/test1/CMakeLists.txt | 4 +- .../c_runtime/strncat/test1/CMakeLists.txt | 4 +- .../c_runtime/strncmp/test1/CMakeLists.txt | 4 +- .../c_runtime/strncpy/test1/CMakeLists.txt | 4 +- .../c_runtime/strpbrk/test1/CMakeLists.txt | 4 +- .../c_runtime/strrchr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strspn/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strstr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strtod/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strtod/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/strtok/test1/CMakeLists.txt | 4 +- .../c_runtime/strtoul/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/swprintf/CMakeLists.txt | 1 - .../tests/palsuite/c_runtime/swprintf/swprintf.h | 60 +- .../c_runtime/swprintf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/swprintf/test1/test1.cpp | 2 +- .../c_runtime/swprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test19/CMakeLists.txt | 4 +- .../palsuite/c_runtime/swprintf/test19/test19.cpp | 8 - .../c_runtime/swprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/swprintf/test2/test2.cpp | 6 + .../c_runtime/swprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/swprintf/test3/test3.cpp | 6 + .../c_runtime/swprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/swprintf/test4/test4.cpp | 2 +- .../c_runtime/swprintf/test5/CMakeLists.txt | 19 - .../palsuite/c_runtime/swprintf/test5/test5.cpp | 67 -- .../palsuite/c_runtime/swprintf/test5/testinfo.dat | 12 - .../c_runtime/swprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/swprintf/test9/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test1/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test10/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test11/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test12/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test13/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test14/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test15/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test16/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test17/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test2/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test3/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test4/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test5/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test6/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test7/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test8/CMakeLists.txt | 4 +- .../c_runtime/swscanf/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/tan/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/tanf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/tanh/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/tanhf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/time/test1/CMakeLists.txt | 4 +- .../c_runtime/tolower/test1/CMakeLists.txt | 4 +- .../c_runtime/toupper/test1/CMakeLists.txt | 4 +- .../c_runtime/towlower/test1/CMakeLists.txt | 4 +- .../c_runtime/towupper/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ungetc/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/ungetc/test2/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test1/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test19/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vfprintf/test2/test2.cpp | 6 + .../c_runtime/vfprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vfprintf/test3/test3.cpp | 6 + .../c_runtime/vfprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vfprintf/test4/test4.cpp | 2 +- .../c_runtime/vfprintf/test5/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/vfprintf/test9/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test1/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test19/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vprintf/test2/test2.cpp | 6 + .../c_runtime/vprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vprintf/test3/test3.cpp | 6 + .../c_runtime/vprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vprintf/test4/test4.cpp | 2 +- .../c_runtime/vprintf/test5/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/vprintf/test9/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vsprintf/CMakeLists.txt | 1 - .../c_runtime/vsprintf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vsprintf/test1/test1.cpp | 6 +- .../c_runtime/vsprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test19/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vsprintf/test2/test2.cpp | 6 + .../c_runtime/vsprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vsprintf/test3/test3.cpp | 6 + .../c_runtime/vsprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vsprintf/test4/test4.cpp | 2 +- .../c_runtime/vsprintf/test5/CMakeLists.txt | 19 - .../palsuite/c_runtime/vsprintf/test5/test5.cpp | 43 - .../palsuite/c_runtime/vsprintf/test5/testinfo.dat | 14 - .../c_runtime/vsprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/vsprintf/test9/CMakeLists.txt | 4 +- .../tests/palsuite/c_runtime/vsprintf/vsprintf.h | 30 +- .../palsuite/c_runtime/vswprintf/CMakeLists.txt | 1 - .../c_runtime/vswprintf/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vswprintf/test1/test1.cpp | 2 +- .../c_runtime/vswprintf/test10/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test11/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test12/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test13/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test14/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test15/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test16/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test17/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test18/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test19/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vswprintf/test19/test19.cpp | 4 +- .../c_runtime/vswprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vswprintf/test2/test2.cpp | 6 + .../c_runtime/vswprintf/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vswprintf/test3/test3.cpp | 6 + .../c_runtime/vswprintf/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/vswprintf/test4/test4.cpp | 6 +- .../c_runtime/vswprintf/test5/CMakeLists.txt | 19 - .../palsuite/c_runtime/vswprintf/test5/test5.cpp | 79 -- .../c_runtime/vswprintf/test5/testinfo.dat | 14 - .../c_runtime/vswprintf/test6/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test7/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test8/CMakeLists.txt | 4 +- .../c_runtime/vswprintf/test9/CMakeLists.txt | 4 +- .../tests/palsuite/c_runtime/vswprintf/vswprintf.h | 18 +- .../palsuite/c_runtime/wcscat/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcschr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcscmp/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcscpy/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcslen/test1/CMakeLists.txt | 4 +- .../c_runtime/wcsncat/test1/CMakeLists.txt | 4 +- .../c_runtime/wcsncmp/test1/CMakeLists.txt | 4 +- .../c_runtime/wcsncpy/test1/CMakeLists.txt | 4 +- .../c_runtime/wcspbrk/test1/CMakeLists.txt | 4 +- .../c_runtime/wcsrchr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcsstr/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstod/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstod/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstok/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstol/test1/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstol/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstol/test3/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstol/test4/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstol/test5/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wcstol/test6/CMakeLists.txt | 4 +- .../c_runtime/wcstoul/test1/CMakeLists.txt | 4 +- .../c_runtime/wcstoul/test2/CMakeLists.txt | 4 +- .../c_runtime/wcstoul/test3/CMakeLists.txt | 4 +- .../c_runtime/wcstoul/test4/CMakeLists.txt | 4 +- .../c_runtime/wcstoul/test5/CMakeLists.txt | 4 +- .../c_runtime/wcstoul/test6/CMakeLists.txt | 4 +- .../c_runtime/wprintf/test1/CMakeLists.txt | 4 +- .../c_runtime/wprintf/test2/CMakeLists.txt | 4 +- .../palsuite/c_runtime/wprintf/test2/test2.cpp | 6 + src/pal/tests/palsuite/common/ResultTime.h | 20 - .../event/nonshared/CMakeLists.txt | 4 +- .../object_management/event/shared/CMakeLists.txt | 4 +- .../mutex/nonshared/CMakeLists.txt | 4 +- .../object_management/mutex/shared/CMakeLists.txt | 4 +- .../semaphore/nonshared/CMakeLists.txt | 4 +- .../semaphore/shared/CMakeLists.txt | 4 +- .../object_management/semaphore/shared/main.cpp | 3 - .../synchronization/criticalsection/CMakeLists.txt | 4 +- .../nativecriticalsection/CMakeLists.txt | 4 +- .../pal_composite_native_cs.cpp | 6 +- .../nativecs_interlocked/CMakeLists.txt | 4 +- .../pal_composite_native_cs.cpp | 6 +- .../threading/threadsuspension/CMakeLists.txt | 4 +- .../threadsuspension_switchthread/CMakeLists.txt | 4 +- .../tests/palsuite/composite/wfmo/CMakeLists.txt | 4 +- .../debug_api/DebugBreak/test1/CMakeLists.txt | 4 +- .../OutputDebugStringA/test1/CMakeLists.txt | 8 +- .../OutputDebugStringW/test1/CMakeLists.txt | 4 +- .../WriteProcessMemory/test1/CMakeLists.txt | 8 +- .../WriteProcessMemory/test3/CMakeLists.txt | 8 +- .../WriteProcessMemory/test4/CMakeLists.txt | 8 +- .../PAL_EXCEPT_FILTER/test1/CMakeLists.txt | 4 +- .../PAL_EXCEPT_FILTER/test2/CMakeLists.txt | 4 +- .../PAL_EXCEPT_FILTER/test3/CMakeLists.txt | 4 +- .../PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt | 4 +- .../PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt | 4 +- .../PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt | 4 +- .../PAL_TRY_EXCEPT/test1/CMakeLists.txt | 4 +- .../PAL_TRY_EXCEPT/test2/CMakeLists.txt | 4 +- .../PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt | 4 +- .../PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt | 4 +- .../PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt | 4 +- .../PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt | 4 +- .../RaiseException/test1/CMakeLists.txt | 4 +- .../RaiseException/test2/CMakeLists.txt | 4 +- .../RaiseException/test3/CMakeLists.txt | 4 +- .../test1/CMakeLists.txt | 4 +- .../pal_except/test1/CMakeLists.txt | 4 +- .../pal_except/test2/CMakeLists.txt | 4 +- .../pal_except/test3/CMakeLists.txt | 4 +- .../pal_except/test4/CMakeLists.txt | 4 +- .../pal_except/test5/CMakeLists.txt | 4 +- .../pal_except/test6/CMakeLists.txt | 4 +- .../pal_except/test7/CMakeLists.txt | 4 +- .../pal_finally/test1/CMakeLists.txt | 4 +- .../pal_sxs/test1/CMakeLists.txt | 7 +- .../file_io/AreFileApisANSI/test1/CMakeLists.txt | 4 +- .../file_io/CompareFileTime/test1/CMakeLists.txt | 4 +- .../file_io/CopyFileA/test1/CMakeLists.txt | 4 +- .../file_io/CopyFileA/test2/CMakeLists.txt | 4 +- .../file_io/CopyFileA/test3/CMakeLists.txt | 4 +- .../file_io/CopyFileA/test4/CMakeLists.txt | 4 +- .../file_io/CopyFileW/test1/CMakeLists.txt | 4 +- .../file_io/CopyFileW/test2/CMakeLists.txt | 4 +- .../file_io/CopyFileW/test3/CMakeLists.txt | 4 +- .../file_io/CreateDirectoryA/test1/CMakeLists.txt | 4 +- .../file_io/CreateDirectoryA/test2/CMakeLists.txt | 4 +- .../file_io/CreateDirectoryW/test1/CMakeLists.txt | 4 +- .../file_io/CreateDirectoryW/test2/CMakeLists.txt | 4 +- .../file_io/CreateFileA/test1/CMakeLists.txt | 4 +- .../file_io/CreateFileW/test1/CMakeLists.txt | 4 +- .../file_io/DeleteFileA/test1/CMakeLists.txt | 4 +- .../file_io/DeleteFileW/test1/CMakeLists.txt | 4 +- .../file_io/FILECanonicalizePath/CMakeLists.txt | 4 +- .../FileTimeToDosDateTime/test1/CMakeLists.txt | 4 +- .../file_io/FindClose/test1/CMakeLists.txt | 4 +- .../file_io/FindFirstFileA/test1/CMakeLists.txt | 4 +- .../file_io/FindFirstFileW/test1/CMakeLists.txt | 4 +- .../file_io/FindNextFileA/test1/CMakeLists.txt | 4 +- .../file_io/FindNextFileA/test2/CMakeLists.txt | 4 +- .../file_io/FindNextFileW/test1/CMakeLists.txt | 4 +- .../file_io/FindNextFileW/test2/CMakeLists.txt | 4 +- .../file_io/FlushFileBuffers/test1/CMakeLists.txt | 4 +- .../file_io/GetConsoleCP/test1/CMakeLists.txt | 4 +- .../GetConsoleOutputCP/test1/CMakeLists.txt | 4 +- .../GetCurrentDirectoryA/test1/CMakeLists.txt | 4 +- .../GetCurrentDirectoryW/test1/CMakeLists.txt | 4 +- .../file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt | 4 +- .../file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt | 4 +- .../GetFileAttributesA/test1/CMakeLists.txt | 4 +- .../GetFileAttributesExW/test1/CMakeLists.txt | 4 +- .../GetFileAttributesExW/test2/CMakeLists.txt | 4 +- .../GetFileAttributesW/test1/CMakeLists.txt | 4 +- .../file_io/GetFileSize/test1/CMakeLists.txt | 4 +- .../file_io/GetFileSizeEx/test1/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test1/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test2/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test3/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test4/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test5/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test6/CMakeLists.txt | 4 +- .../file_io/GetFileTime/test7/CMakeLists.txt | 4 +- .../file_io/GetFileType/test1/CMakeLists.txt | 4 +- .../file_io/GetFileType/test2/CMakeLists.txt | 4 +- .../file_io/GetFileType/test3/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameA/test1/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameA/test2/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameA/test3/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameA/test4/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameW/test1/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameW/test2/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameW/test3/CMakeLists.txt | 4 +- .../file_io/GetFullPathNameW/test4/CMakeLists.txt | 4 +- .../file_io/GetLongPathNameW/test1/CMakeLists.txt | 4 +- .../file_io/GetLongPathNameW/test2/CMakeLists.txt | 4 +- .../file_io/GetStdHandle/test1/CMakeLists.txt | 4 +- .../file_io/GetStdHandle/test2/CMakeLists.txt | 4 +- .../file_io/GetSystemTime/test1/CMakeLists.txt | 4 +- .../GetSystemTimeAsFileTime/test1/CMakeLists.txt | 4 +- .../file_io/GetTempFileNameA/test1/CMakeLists.txt | 4 +- .../file_io/GetTempFileNameA/test2/CMakeLists.txt | 4 +- .../file_io/GetTempFileNameA/test3/CMakeLists.txt | 4 +- .../file_io/GetTempFileNameW/test1/CMakeLists.txt | 4 +- .../GetTempFileNameW/test1/GetTempFileNameW.cpp | 2 +- .../file_io/GetTempFileNameW/test2/CMakeLists.txt | 4 +- .../file_io/GetTempFileNameW/test3/CMakeLists.txt | 4 +- .../file_io/GetTempPathW/test1/CMakeLists.txt | 4 +- .../file_io/MoveFileA/test1/CMakeLists.txt | 4 +- .../file_io/MoveFileExA/test1/CMakeLists.txt | 4 +- .../file_io/MoveFileExW/test1/CMakeLists.txt | 4 +- .../file_io/MoveFileW/test1/CMakeLists.txt | 4 +- .../palsuite/file_io/ReadFile/test1/CMakeLists.txt | 4 +- .../palsuite/file_io/ReadFile/test2/CMakeLists.txt | 4 +- .../palsuite/file_io/ReadFile/test2/ReadFile.cpp | 4 - .../palsuite/file_io/ReadFile/test3/CMakeLists.txt | 4 +- .../palsuite/file_io/ReadFile/test4/CMakeLists.txt | 4 +- .../file_io/RemoveDirectoryA/test1/CMakeLists.txt | 4 +- .../file_io/RemoveDirectoryW/test1/CMakeLists.txt | 4 +- .../file_io/SearchPathA/test1/CMakeLists.txt | 4 +- .../file_io/SearchPathW/test1/CMakeLists.txt | 4 +- .../SetCurrentDirectoryA/test1/CMakeLists.txt | 4 +- .../SetCurrentDirectoryA/test2/CMakeLists.txt | 4 +- .../SetCurrentDirectoryA/test3/CMakeLists.txt | 4 +- .../SetCurrentDirectoryW/test1/CMakeLists.txt | 4 +- .../SetCurrentDirectoryW/test2/CMakeLists.txt | 4 +- .../SetCurrentDirectoryW/test3/CMakeLists.txt | 4 +- .../file_io/SetEndOfFile/test1/CMakeLists.txt | 4 +- .../file_io/SetEndOfFile/test2/CMakeLists.txt | 4 +- .../file_io/SetEndOfFile/test3/CMakeLists.txt | 4 +- .../file_io/SetEndOfFile/test4/CMakeLists.txt | 4 +- .../file_io/SetEndOfFile/test5/CMakeLists.txt | 4 +- .../SetFileAttributesA/test1/CMakeLists.txt | 4 +- .../SetFileAttributesA/test2/CMakeLists.txt | 4 +- .../SetFileAttributesA/test3/CMakeLists.txt | 4 +- .../SetFileAttributesA/test4/CMakeLists.txt | 4 +- .../SetFileAttributesW/test1/CMakeLists.txt | 4 +- .../SetFileAttributesW/test2/CMakeLists.txt | 4 +- .../SetFileAttributesW/test3/CMakeLists.txt | 4 +- .../SetFileAttributesW/test4/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test1/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test2/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test3/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test4/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test5/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test6/CMakeLists.txt | 4 +- .../file_io/SetFilePointer/test7/CMakeLists.txt | 4 +- .../file_io/SetFileTime/test1/CMakeLists.txt | 4 +- .../file_io/SetFileTime/test2/CMakeLists.txt | 4 +- .../file_io/SetFileTime/test3/CMakeLists.txt | 4 +- .../file_io/SetFileTime/test4/CMakeLists.txt | 4 +- .../file_io/WriteFile/test1/CMakeLists.txt | 4 +- .../file_io/WriteFile/test2/CMakeLists.txt | 4 +- .../palsuite/file_io/WriteFile/test2/WriteFile.cpp | 4 - .../file_io/WriteFile/test3/CMakeLists.txt | 4 +- .../file_io/WriteFile/test4/CMakeLists.txt | 4 +- .../file_io/WriteFile/test5/CMakeLists.txt | 4 +- .../file_io/errorpathnotfound/test1/CMakeLists.txt | 4 +- .../file_io/errorpathnotfound/test2/CMakeLists.txt | 4 +- .../file_io/errorpathnotfound/test3/CMakeLists.txt | 4 +- .../file_io/errorpathnotfound/test4/CMakeLists.txt | 4 +- .../file_io/gettemppatha/test1/CMakeLists.txt | 4 +- .../CreateFileMappingA/test1/CMakeLists.txt | 4 +- .../CreateFileMappingA/test3/CMakeLists.txt | 4 +- .../CreateFileMappingA/test4/CMakeLists.txt | 4 +- .../CreateFileMappingA/test5/CMakeLists.txt | 4 +- .../CreateFileMappingA/test6/CMakeLists.txt | 4 +- .../CreateFileMappingA/test7/CMakeLists.txt | 4 +- .../CreateFileMappingA/test8/CMakeLists.txt | 4 +- .../CreateFileMappingA/test9/CMakeLists.txt | 4 +- .../CreateFileMapping_neg1/CMakeLists.txt | 4 +- .../CreateFileMappingW/test1/CMakeLists.txt | 4 +- .../CreateFileMappingW/test2/CMakeLists.txt | 4 +- .../CreateFileMappingW/test3/CMakeLists.txt | 4 +- .../CreateFileMappingW/test4/CMakeLists.txt | 4 +- .../CreateFileMappingW/test5/CMakeLists.txt | 4 +- .../CreateFileMappingW/test6/CMakeLists.txt | 4 +- .../CreateFileMappingW/test7/CMakeLists.txt | 4 +- .../CreateFileMappingW/test8/CMakeLists.txt | 4 +- .../CreateFileMappingW/test9/CMakeLists.txt | 4 +- .../FreeLibrary/test1/CMakeLists.txt | 4 +- .../FreeLibrary/test2/CMakeLists.txt | 4 +- .../FreeLibraryAndExitThread/test1/CMakeLists.txt | 4 +- .../GetModuleFileNameA/test1/CMakeLists.txt | 4 +- .../GetModuleFileNameA/test2/CMakeLists.txt | 4 +- .../GetModuleFileNameW/test1/CMakeLists.txt | 4 +- .../GetModuleFileNameW/test2/CMakeLists.txt | 4 +- .../GetProcAddress/test1/CMakeLists.txt | 4 +- .../GetProcAddress/test2/CMakeLists.txt | 4 +- .../GetProcessHeap/test1/CMakeLists.txt | 4 +- .../HeapAlloc/test1/CMakeLists.txt | 4 +- .../HeapAlloc/test2/CMakeLists.txt | 4 +- .../HeapAlloc/test3/CMakeLists.txt | 4 +- .../HeapFree/test1/CMakeLists.txt | 4 +- .../HeapReAlloc/test1/CMakeLists.txt | 4 +- .../HeapReAlloc/test2/CMakeLists.txt | 4 +- .../HeapReAlloc/test3/CMakeLists.txt | 4 +- .../HeapReAlloc/test4/CMakeLists.txt | 4 +- .../HeapReAlloc/test5/CMakeLists.txt | 4 +- .../LocalAlloc/test1/CMakeLists.txt | 4 +- .../LocalFree/test1/CMakeLists.txt | 4 +- .../LocalFree/test2/CMakeLists.txt | 4 +- .../LockFile/test1/CMakeLists.txt | 8 +- .../LockFile/test2/CMakeLists.txt | 4 +- .../LockFile/test3/CMakeLists.txt | 8 +- .../LockFile/test4/CMakeLists.txt | 4 +- .../LockFile/test5/CMakeLists.txt | 8 +- .../LockFile/test6/CMakeLists.txt | 8 +- .../LockFile/test7/CMakeLists.txt | 4 +- .../MapViewOfFile/test1/CMakeLists.txt | 4 +- .../MapViewOfFile/test2/CMakeLists.txt | 4 +- .../MapViewOfFile/test3/CMakeLists.txt | 4 +- .../MapViewOfFile/test4/CMakeLists.txt | 4 +- .../MapViewOfFile/test5/CMakeLists.txt | 4 +- .../MapViewOfFile/test6/CMakeLists.txt | 4 +- .../OpenFileMappingA/test1/CMakeLists.txt | 4 +- .../OpenFileMappingA/test2/CMakeLists.txt | 4 +- .../OpenFileMappingA/test3/CMakeLists.txt | 4 +- .../OpenFileMappingW/test1/CMakeLists.txt | 4 +- .../OpenFileMappingW/test2/CMakeLists.txt | 4 +- .../OpenFileMappingW/test3/CMakeLists.txt | 4 +- .../ProbeMemory/ProbeMemory_neg1/CMakeLists.txt | 4 +- .../ProbeMemory/test1/CMakeLists.txt | 4 +- .../RtlMoveMemory/test1/CMakeLists.txt | 4 +- .../RtlMoveMemory/test3/CMakeLists.txt | 4 +- .../RtlMoveMemory/test4/CMakeLists.txt | 4 +- .../RtlMoveMemory/test5/CMakeLists.txt | 4 +- .../UnlockFile/test1/CMakeLists.txt | 8 +- .../UnlockFile/test2/CMakeLists.txt | 4 +- .../UnlockFile/test3/CMakeLists.txt | 8 +- .../UnlockFile/test4/CMakeLists.txt | 4 +- .../UnmapViewOfFile/test1/CMakeLists.txt | 4 +- .../UnmapViewOfFile/test2/CMakeLists.txt | 4 +- .../VirtualAlloc/test1/CMakeLists.txt | 4 +- .../VirtualAlloc/test10/CMakeLists.txt | 4 +- .../VirtualAlloc/test11/CMakeLists.txt | 4 +- .../VirtualAlloc/test12/CMakeLists.txt | 4 +- .../VirtualAlloc/test13/CMakeLists.txt | 4 +- .../VirtualAlloc/test14/CMakeLists.txt | 4 +- .../VirtualAlloc/test15/CMakeLists.txt | 4 +- .../VirtualAlloc/test16/CMakeLists.txt | 4 +- .../VirtualAlloc/test17/CMakeLists.txt | 4 +- .../VirtualAlloc/test18/CMakeLists.txt | 4 +- .../VirtualAlloc/test19/CMakeLists.txt | 4 +- .../VirtualAlloc/test2/CMakeLists.txt | 4 +- .../VirtualAlloc/test20/CMakeLists.txt | 4 +- .../VirtualAlloc/test21/CMakeLists.txt | 4 +- .../VirtualAlloc/test22/CMakeLists.txt | 4 +- .../VirtualAlloc/test3/CMakeLists.txt | 4 +- .../VirtualAlloc/test4/CMakeLists.txt | 4 +- .../VirtualAlloc/test5/CMakeLists.txt | 4 +- .../VirtualAlloc/test6/CMakeLists.txt | 4 +- .../VirtualAlloc/test7/CMakeLists.txt | 4 +- .../VirtualAlloc/test8/CMakeLists.txt | 4 +- .../VirtualAlloc/test9/CMakeLists.txt | 4 +- .../VirtualFree/test1/CMakeLists.txt | 4 +- .../VirtualFree/test2/CMakeLists.txt | 4 +- .../VirtualFree/test3/CMakeLists.txt | 4 +- .../VirtualProtect/test1/CMakeLists.txt | 4 +- .../VirtualProtect/test2/CMakeLists.txt | 4 +- .../VirtualProtect/test3/CMakeLists.txt | 4 +- .../VirtualProtect/test4/CMakeLists.txt | 4 +- .../VirtualProtect/test6/CMakeLists.txt | 4 +- .../VirtualProtect/test7/CMakeLists.txt | 4 +- .../VirtualQuery/test1/CMakeLists.txt | 4 +- .../loader/LoadLibraryA/test1/CMakeLists.txt | 4 +- .../loader/LoadLibraryA/test2/CMakeLists.txt | 4 +- .../loader/LoadLibraryA/test3/CMakeLists.txt | 4 +- .../loader/LoadLibraryA/test5/CMakeLists.txt | 4 +- .../loader/LoadLibraryA/test6/CMakeLists.txt | 8 +- .../loader/LoadLibraryA/test7/CMakeLists.txt | 4 +- .../loader/LoadLibraryA/test8/CMakeLists.txt | 8 +- .../loader/LoadLibraryW/test1/CMakeLists.txt | 4 +- .../loader/LoadLibraryW/test2/CMakeLists.txt | 4 +- .../loader/LoadLibraryW/test3/CMakeLists.txt | 4 +- .../loader/LoadLibraryW/test5/CMakeLists.txt | 4 +- .../CompareStringA/test1/CMakeLists.txt | 4 +- .../CompareStringW/test1/CMakeLists.txt | 4 +- .../locale_info/GetACP/test1/CMakeLists.txt | 4 +- .../locale_info/GetCPInfo/test1/CMakeLists.txt | 4 +- .../locale_info/GetCPInfo/test2/CMakeLists.txt | 4 +- .../locale_info/GetCPInfo/test3/CMakeLists.txt | 4 +- .../GetLocaleInfoW/test1/CMakeLists.txt | 4 +- .../GetLocaleInfoW/test2/CMakeLists.txt | 4 +- .../GetStringTypeExW/test1/CMakeLists.txt | 4 +- .../GetStringTypeExW/test2/CMakeLists.txt | 4 +- .../GetSystemDefaultLangID/test1/CMakeLists.txt | 4 +- .../GetThreadLocale/test1/CMakeLists.txt | 4 +- .../GetTimeZoneInformation/test1/CMakeLists.txt | 4 +- .../GetUserDefaultLCID/test1/CMakeLists.txt | 4 +- .../GetUserDefaultLangID/test1/CMakeLists.txt | 4 +- .../IsDBCSLeadByte/test1/CMakeLists.txt | 4 +- .../IsDBCSLeadByteEx/test1/CMakeLists.txt | 4 +- .../IsValidCodePage/test1/CMakeLists.txt | 4 +- .../IsValidCodePage/test2/CMakeLists.txt | 4 +- .../locale_info/IsValidLocale/test1/CMakeLists.txt | 4 +- .../MultiByteToWideChar/test1/CMakeLists.txt | 4 +- .../MultiByteToWideChar/test2/CMakeLists.txt | 4 +- .../MultiByteToWideChar/test3/CMakeLists.txt | 4 +- .../MultiByteToWideChar/test4/CMakeLists.txt | 4 +- .../SetThreadLocale/test1/CMakeLists.txt | 4 +- .../WideCharToMultiByte/test1/CMakeLists.txt | 4 +- .../WideCharToMultiByte/test2/CMakeLists.txt | 4 +- .../WideCharToMultiByte/test3/CMakeLists.txt | 4 +- .../WideCharToMultiByte/test4/CMakeLists.txt | 4 +- .../WideCharToMultiByte/test5/CMakeLists.txt | 4 +- .../miscellaneous/CharNextA/test1/CMakeLists.txt | 4 +- .../miscellaneous/CharNextA/test2/CMakeLists.txt | 4 +- .../miscellaneous/CharNextExA/test1/CMakeLists.txt | 4 +- .../miscellaneous/CharNextExA/test2/CMakeLists.txt | 4 +- .../miscellaneous/CloseHandle/test1/CMakeLists.txt | 4 +- .../miscellaneous/CloseHandle/test2/CMakeLists.txt | 4 +- .../miscellaneous/CreatePipe/test1/CMakeLists.txt | 4 +- .../FlushInstructionCache/test1/CMakeLists.txt | 4 +- .../FormatMessageW/test1/CMakeLists.txt | 4 +- .../FormatMessageW/test2/CMakeLists.txt | 4 +- .../miscellaneous/FormatMessageW/test2/test.cpp | 2 +- .../FormatMessageW/test3/CMakeLists.txt | 4 +- .../FormatMessageW/test4/CMakeLists.txt | 4 +- .../FormatMessageW/test5/CMakeLists.txt | 4 +- .../FormatMessageW/test6/CMakeLists.txt | 4 +- .../FreeEnvironmentStringsW/test1/CMakeLists.txt | 4 +- .../FreeEnvironmentStringsW/test2/CMakeLists.txt | 4 +- .../GetCalendarInfoW/test1/CMakeLists.txt | 4 +- .../GetCalendarInfoW/test2/CMakeLists.txt | 4 +- .../GetCommandLineW/test1/CMakeLists.txt | 4 +- .../GetComputerNameW/test1/CMakeLists.txt | 4 +- .../GetDateFormatW_neg1/CMakeLists.txt | 4 +- .../GetDateFormatW_neg2/CMakeLists.txt | 4 +- .../GetDateFormatW/test1/CMakeLists.txt | 4 +- .../GetEnvironmentStringsW/test1/CMakeLists.txt | 4 +- .../GetEnvironmentVariableA/test1/CMakeLists.txt | 4 +- .../GetEnvironmentVariableA/test2/CMakeLists.txt | 4 +- .../GetEnvironmentVariableA/test3/CMakeLists.txt | 4 +- .../GetEnvironmentVariableA/test4/CMakeLists.txt | 4 +- .../GetEnvironmentVariableA/test5/CMakeLists.txt | 4 +- .../GetEnvironmentVariableA/test6/CMakeLists.txt | 4 +- .../GetEnvironmentVariableW/test1/CMakeLists.txt | 4 +- .../GetEnvironmentVariableW/test2/CMakeLists.txt | 4 +- .../GetEnvironmentVariableW/test3/CMakeLists.txt | 4 +- .../GetEnvironmentVariableW/test4/CMakeLists.txt | 4 +- .../GetEnvironmentVariableW/test5/CMakeLists.txt | 4 +- .../GetEnvironmentVariableW/test6/CMakeLists.txt | 4 +- .../GetLastError/test1/CMakeLists.txt | 4 +- .../GetSystemInfo/test1/CMakeLists.txt | 4 +- .../GetTickCount/test1/CMakeLists.txt | 4 +- .../GetUserNameW/test1/CMakeLists.txt | 4 +- .../GetVersionExA/test1/CMakeLists.txt | 4 +- .../GetVersionExW/test1/CMakeLists.txt | 4 +- .../InterLockedExchangeAdd/test1/CMakeLists.txt | 4 +- .../InterLockedExchangeAdd/test1/test.cpp | 2 +- .../InterlockedBit/test1/CMakeLists.txt | 4 +- .../InterlockedBit/test2/CMakeLists.txt | 4 +- .../test1/CMakeLists.txt | 4 +- .../test2/CMakeLists.txt | 4 +- .../test1/CMakeLists.txt | 4 +- .../InterlockedCompareExchange64/test1/test.cpp | 25 +- .../test2/CMakeLists.txt | 4 +- .../InterlockedCompareExchange64/test2/test.cpp | 4 +- .../test1/CMakeLists.txt | 4 +- .../InterlockedDecrement/test1/CMakeLists.txt | 4 +- .../InterlockedDecrement/test2/CMakeLists.txt | 4 +- .../InterlockedDecrement64/test1/CMakeLists.txt | 4 +- .../InterlockedDecrement64/test1/test.cpp | 14 +- .../InterlockedDecrement64/test2/CMakeLists.txt | 4 +- .../InterlockedDecrement64/test2/test.cpp | 4 +- .../InterlockedExchange/test1/CMakeLists.txt | 4 +- .../InterlockedExchange64/test1/CMakeLists.txt | 4 +- .../InterlockedExchange64/test1/test.cpp | 15 +- .../test1/CMakeLists.txt | 4 +- .../InterlockedIncrement/test1/CMakeLists.txt | 4 +- .../InterlockedIncrement/test2/CMakeLists.txt | 4 +- .../InterlockedIncrement64/test1/CMakeLists.txt | 4 +- .../InterlockedIncrement64/test1/test.cpp | 14 +- .../InterlockedIncrement64/test2/CMakeLists.txt | 4 +- .../InterlockedIncrement64/test2/test.cpp | 4 +- .../IsBadCodePtr/test1/CMakeLists.txt | 4 +- .../IsBadReadPtr/test1/CMakeLists.txt | 4 +- .../IsBadWritePtr/test1/CMakeLists.txt | 4 +- .../IsBadWritePtr/test2/CMakeLists.txt | 4 +- .../IsBadWritePtr/test3/CMakeLists.txt | 4 +- .../miscellaneous/MessageBoxW/test1/CMakeLists.txt | 4 +- .../miscellaneous/MessageBoxW/test2/CMakeLists.txt | 4 +- .../SetEnvironmentVariableA/test1/CMakeLists.txt | 4 +- .../SetEnvironmentVariableA/test2/CMakeLists.txt | 4 +- .../SetEnvironmentVariableA/test3/CMakeLists.txt | 4 +- .../SetEnvironmentVariableA/test4/CMakeLists.txt | 4 +- .../SetEnvironmentVariableW/test1/CMakeLists.txt | 4 +- .../SetEnvironmentVariableW/test2/CMakeLists.txt | 4 +- .../SetEnvironmentVariableW/test3/CMakeLists.txt | 4 +- .../SetEnvironmentVariableW/test4/CMakeLists.txt | 4 +- .../SetLastError/test1/CMakeLists.txt | 4 +- .../miscellaneous/_i64tow/test1/CMakeLists.txt | 4 +- .../miscellaneous/lstrlenA/test1/CMakeLists.txt | 4 +- .../miscellaneous/lstrlenW/test1/CMakeLists.txt | 4 +- .../queryperformancecounter/test1/CMakeLists.txt | 4 +- .../queryperformancefrequency/test1/CMakeLists.txt | 4 +- .../PAL_GetPALDirectoryW/test1/CMakeLists.txt | 4 +- .../PAL_GetUserTempDirectoryW/test1/CMakeLists.txt | 4 +- .../PAL_Initialize_Terminate/test1/CMakeLists.txt | 4 +- .../PAL_Initialize_Terminate/test2/CMakeLists.txt | 4 +- .../test1/CMakeLists.txt | 4 +- .../test2_neg/CMakeLists.txt | 4 +- .../pal_specific/PAL_errno/test1/CMakeLists.txt | 4 +- .../PAL_get_stderr/test1/CMakeLists.txt | 4 +- .../PAL_get_stdin/test1/CMakeLists.txt | 4 +- .../PAL_get_stdout/test1/CMakeLists.txt | 4 +- .../pal_entrypoint/test1/CMakeLists.txt | 4 +- .../pal_initializedebug/test1/CMakeLists.txt | 4 +- src/pal/tests/palsuite/paltestlist.txt | 41 +- src/pal/tests/palsuite/palverify.dat | 37 +- .../tests/palsuite/samples/test1/CMakeLists.txt | 4 +- .../tests/palsuite/samples/test2/CMakeLists.txt | 4 +- .../threading/CreateEventA/test1/CMakeLists.txt | 4 +- .../threading/CreateEventA/test2/CMakeLists.txt | 4 +- .../threading/CreateEventA/test3/CMakeLists.txt | 4 +- .../threading/CreateEventW/test1/CMakeLists.txt | 4 +- .../threading/CreateEventW/test2/CMakeLists.txt | 4 +- .../threading/CreateEventW/test3/CMakeLists.txt | 4 +- .../CreateMutexA_ReleaseMutex/test1/CMakeLists.txt | 4 +- .../CreateMutexA_ReleaseMutex/test2/CMakeLists.txt | 4 +- .../CreateMutexW_ReleaseMutex/test1/CMakeLists.txt | 4 +- .../CreateMutexW_ReleaseMutex/test2/CMakeLists.txt | 4 +- .../threading/CreateProcessA/test1/CMakeLists.txt | 8 +- .../threading/CreateProcessA/test2/CMakeLists.txt | 8 +- .../threading/CreateProcessW/test1/CMakeLists.txt | 8 +- .../threading/CreateProcessW/test2/CMakeLists.txt | 8 +- .../test1/CMakeLists.txt | 4 +- .../test2/CMakeLists.txt | 4 +- .../test3/CMakeLists.txt | 4 +- .../test1/CMakeLists.txt | 4 +- .../test2/CMakeLists.txt | 4 +- .../test3/CMakeLists.txt | 4 +- .../threading/CreateThread/test1/CMakeLists.txt | 4 +- .../threading/CreateThread/test1/test1.cpp | 4 - .../threading/CreateThread/test2/CMakeLists.txt | 4 +- .../threading/CreateThread/test3/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test1/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test2/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test3/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test4/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test5/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test6/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test7/CMakeLists.txt | 4 +- .../CriticalSectionFunctions/test8/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test1/CMakeLists.txt | 4 +- .../DuplicateHandle/test10/CMakeLists.txt | 4 +- .../DuplicateHandle/test11/CMakeLists.txt | 8 +- .../DuplicateHandle/test12/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test2/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test3/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test4/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test5/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test6/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test7/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test8/CMakeLists.txt | 4 +- .../threading/DuplicateHandle/test9/CMakeLists.txt | 4 +- .../threading/ExitProcess/test1/CMakeLists.txt | 4 +- .../threading/ExitProcess/test2/CMakeLists.txt | 4 +- .../threading/ExitProcess/test3/CMakeLists.txt | 4 +- .../threading/ExitThread/test1/CMakeLists.txt | 4 +- .../threading/ExitThread/test2/CMakeLists.txt | 8 +- .../GetCurrentProcess/test1/CMakeLists.txt | 4 +- .../GetCurrentProcessId/test1/CMakeLists.txt | 4 +- .../GetCurrentThread/test1/CMakeLists.txt | 4 +- .../GetCurrentThread/test2/CMakeLists.txt | 4 +- .../GetCurrentThreadId/test1/CMakeLists.txt | 4 +- .../GetExitCodeProcess/test1/CMakeLists.txt | 8 +- .../threading/GetProcessTimes/test2/CMakeLists.txt | 4 +- .../threading/GetThreadTimes/test1/CMakeLists.txt | 4 +- .../threading/NamedMutex/test1/CMakeLists.txt | 4 +- .../palsuite/threading/NamedMutex/test1/nopal.cpp | 1 + .../threading/OpenEventW/test1/CMakeLists.txt | 4 +- .../threading/OpenEventW/test2/CMakeLists.txt | 4 +- .../threading/OpenEventW/test3/CMakeLists.txt | 8 +- .../threading/OpenEventW/test4/CMakeLists.txt | 4 +- .../threading/OpenEventW/test5/CMakeLists.txt | 4 +- .../threading/OpenProcess/test1/CMakeLists.txt | 8 +- .../QueryThreadCycleTime/test1/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test1/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test2/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test3/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test4/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test5/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test6/CMakeLists.txt | 4 +- .../threading/QueueUserAPC/test7/CMakeLists.txt | 4 +- .../threading/ReleaseMutex/test3/CMakeLists.txt | 4 +- .../threading/ResetEvent/test1/CMakeLists.txt | 4 +- .../threading/ResetEvent/test2/CMakeLists.txt | 4 +- .../threading/ResetEvent/test3/CMakeLists.txt | 4 +- .../threading/ResetEvent/test4/CMakeLists.txt | 4 +- .../threading/ResumeThread/test1/CMakeLists.txt | 4 +- .../threading/SetErrorMode/test1/CMakeLists.txt | 4 +- .../threading/SetEvent/test1/CMakeLists.txt | 4 +- .../threading/SetEvent/test2/CMakeLists.txt | 4 +- .../threading/SetEvent/test3/CMakeLists.txt | 4 +- .../threading/SetEvent/test4/CMakeLists.txt | 4 +- .../palsuite/threading/Sleep/test1/CMakeLists.txt | 4 +- .../palsuite/threading/Sleep/test2/CMakeLists.txt | 4 +- .../threading/SleepEx/test1/CMakeLists.txt | 4 +- .../threading/SleepEx/test2/CMakeLists.txt | 4 +- .../threading/SwitchToThread/test1/CMakeLists.txt | 4 +- .../palsuite/threading/TLS/test1/CMakeLists.txt | 4 +- .../palsuite/threading/TLS/test2/CMakeLists.txt | 4 +- .../palsuite/threading/TLS/test3/CMakeLists.txt | 4 +- .../palsuite/threading/TLS/test4/CMakeLists.txt | 4 +- .../palsuite/threading/TLS/test5/CMakeLists.txt | 4 +- .../TLS/test6_optimizedtls/CMakeLists.txt | 4 +- .../TerminateProcess/test1/CMakeLists.txt | 4 +- .../threading/ThreadPriority/test1/CMakeLists.txt | 4 +- .../WaitForMultipleObjects/test1/CMakeLists.txt | 4 +- .../WaitForMultipleObjectsEx/test1/CMakeLists.txt | 4 +- .../WaitForMultipleObjectsEx/test2/CMakeLists.txt | 4 +- .../WaitForMultipleObjectsEx/test3/CMakeLists.txt | 4 +- .../WaitForMultipleObjectsEx/test4/CMakeLists.txt | 4 +- .../WaitForMultipleObjectsEx/test5/CMakeLists.txt | 8 +- .../WaitForMultipleObjectsEx/test6/CMakeLists.txt | 8 +- .../WFSOExMutexTest/CMakeLists.txt | 4 +- .../WFSOExSemaphoreTest/CMakeLists.txt | 4 +- .../WFSOExThreadTest/CMakeLists.txt | 4 +- .../WFSOMutexTest/CMakeLists.txt | 4 +- .../WFSOProcessTest/CMakeLists.txt | 8 +- .../WFSOSemaphoreTest/CMakeLists.txt | 4 +- .../WFSOThreadTest/CMakeLists.txt | 4 +- .../WaitForSingleObject/test1/CMakeLists.txt | 4 +- .../threading/YieldProcessor/test1/CMakeLists.txt | 4 +- .../releasesemaphore/test1/CMakeLists.txt | 4 +- src/pal/tools/clang-compiler-override-arm.txt | 20 + src/pal/tools/gen-buildsys-clang.sh | 57 +- 1229 files changed, 3538 insertions(+), 9466 deletions(-) delete mode 100644 src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp create mode 100644 src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat delete mode 100644 src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt delete mode 100644 src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp delete mode 100644 src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat create mode 100644 src/pal/tools/clang-compiler-override-arm.txt (limited to 'src/pal') diff --git a/src/pal/CMakeLists.txt b/src/pal/CMakeLists.txt index cb8b05586c..8e3228b622 100644 --- a/src/pal/CMakeLists.txt +++ b/src/pal/CMakeLists.txt @@ -5,7 +5,7 @@ project(COREPAL) if (WIN32) set(FEATURE_EVENT_TRACE 1) endif() -if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_TARGET_ARCH_AMD64) set(FEATURE_EVENT_TRACE 1) endif() diff --git a/src/pal/inc/mbusafecrt.h b/src/pal/inc/mbusafecrt.h index 8cf050f419..f030b7ded2 100644 --- a/src/pal/inc/mbusafecrt.h +++ b/src/pal/inc/mbusafecrt.h @@ -56,7 +56,7 @@ extern WCHAR* wcstok_s( WCHAR* inString, const WCHAR* inControl, WCHAR** ioConte // strnlen is not required unless the source string is completely untrusted (e.g. anonymous input on a website) #ifndef SUPPRESS_STRNLEN extern size_t PAL_strnlen( const char* inString, size_t inMaxSize ); - extern size_t wcsnlen( const WCHAR* inString, size_t inMaxSize ); + extern size_t PAL_wcsnlen( const WCHAR* inString, size_t inMaxSize ); #endif extern errno_t _itoa_s( int inValue, char* outBuffer, size_t inDestBufferSize, int inRadix ); diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h index 0d7c89e6fa..d0b78e942f 100644 --- a/src/pal/inc/pal.h +++ b/src/pal/inc/pal.h @@ -50,7 +50,6 @@ Abstract: extern "C" { #endif -#if defined (PLATFORM_UNIX) // This macro is used to standardize the wide character string literals between UNIX and Windows. // Unix L"" is UTF32, and on windows it's UTF16. Because of built-in assumptions on the size // of string literals, it's important to match behaviour between Unix and Windows. Unix will be defined @@ -65,8 +64,6 @@ extern "C" { #define QUOTE_MACRO_u_HELPER(x) u###x #define QUOTE_MACRO_u(x) QUOTE_MACRO_u_HELPER(x) -#endif - #include #include #include @@ -83,16 +80,6 @@ extern "C" { #define _M_IX86 400 #elif defined(__i386__) && !defined(_M_IX86) #define _M_IX86 300 -#elif defined(__ppc__) && !defined(_M_PPC) -#define _M_PPC 100 -#elif defined(_AIX) && defined(_POWER) && !defined(_M_PPC) -#define _M_PPC 100 -#elif defined(__sparc__) && !defined(_M_SPARC) -#define _M_SPARC 100 -#elif defined(__hppa__) && !defined(_M_PARISC) -#define _M_PARISC 100 -#elif defined(__ia64__) && !defined(_M_IA64) -#define _M_IA64 64100 #elif defined(__x86_64__) && !defined(_M_AMD64) #define _M_AMD64 100 #elif defined(__arm__) && !defined(_M_ARM) @@ -103,20 +90,6 @@ extern "C" { #if defined(_M_IX86) && !defined(_X86_) #define _X86_ -#elif defined(_M_ALPHA) && !defined(_ALPHA_) -#define _ALPHA_ -#elif defined(_M_PPC) && !defined(_PPC_) -#define _PPC_ -#elif defined(_M_SPARC) && !defined(_SPARC_) -#define _SPARC_ -#elif defined(_M_PARISC) && !defined(_PARISC_) -#define _PARISC_ -#elif defined(_M_MRX000) && !defined(_MIPS_) -#define _MIPS_ -#elif defined(_M_M68K) && !defined(_68K_) -#define _68K_ -#elif defined(_M_IA64) && !defined(_IA64_) -#define _IA64_ #elif defined(_M_AMD64) && !defined(_AMD64_) #define _AMD64_ #elif defined(_M_ARM) && !defined(_ARM_) @@ -129,10 +102,6 @@ extern "C" { /******************* ABI-specific glue *******************************/ -#if defined(_PPC_) || defined(_PPC64_) || defined(_SPARC_) || defined(_PARISC_) || defined(_IA64_) -#define BIGENDIAN 1 -#endif - #ifdef __APPLE__ // Both PowerPC, i386 and x86_64 on Mac OS X use 16-byte alignment. #define STACK_ALIGN_BITS 4 @@ -191,19 +160,7 @@ extern "C" { #define __annotation(x) #endif //!MSC_VER -#ifdef _MSC_VER - -#if defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_PPC) || defined(_M_IA64) -#define UNALIGNED __unaligned -#else #define UNALIGNED -#endif - -#else // _MSC_VER - -#define UNALIGNED - -#endif // _MSC_VER #ifndef FORCEINLINE #if _MSC_VER < 1200 @@ -215,75 +172,19 @@ extern "C" { #ifndef PAL_STDCPP_COMPAT -#ifdef _M_ALPHA +#if __GNUC__ -typedef struct { - char *a0; /* pointer to first homed integer argument */ - int offset; /* byte offset of next parameter */ -} va_list; - -#define va_start(list, v) __builtin_va_start(list, v, 1) -#define va_end(list) - -#elif __GNUC__ - -#if defined(_AIX) - -typedef __builtin_va_list __gnuc_va_list; typedef __builtin_va_list va_list; -#define va_start(v,l) __builtin_va_start(v,l) -#define va_end __builtin_va_end -#define va_arg __builtin_va_arg - -#else // _AIX - -#if __GNUC__ == 2 -typedef void * va_list; -#else -typedef __builtin_va_list va_list; -#endif // __GNUC__ /* We should consider if the va_arg definition here is actually necessary. Could we use the standard va_arg definition? */ -#if __GNUC__ == 2 -#if defined(_SPARC_) || defined(_PARISC_) // ToDo: is this the right thing for PARISC? -#define va_start(list, v) (__builtin_next_arg(v), list = (char *) __builtin_saveregs()) -#define __va_rounded_size(TYPE) \ - (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int)) -#define __record_type_class 12 -#define __real_type_class 8 -#define va_arg(pvar,TYPE) \ -__extension__ \ -(*({((__builtin_classify_type (*(TYPE*) 0) >= __record_type_class \ - || (__builtin_classify_type (*(TYPE*) 0) == __real_type_class \ - && sizeof (TYPE) == 16)) \ - ? ((pvar) = (char *)(pvar) + __va_rounded_size (TYPE *), \ - *(TYPE **) (void *) ((char *)(pvar) - __va_rounded_size (TYPE *))) \ - : __va_rounded_size (TYPE) == 8 \ - ? ({ union {char __d[sizeof (TYPE)]; int __i[2];} __u; \ - __u.__i[0] = ((int *) (void *) (pvar))[0]; \ - __u.__i[1] = ((int *) (void *) (pvar))[1]; \ - (pvar) = (char *)(pvar) + 8; \ - (TYPE *) (void *) __u.__d; }) \ - : ((pvar) = (char *)(pvar) + __va_rounded_size (TYPE), \ - ((TYPE *) (void *) ((char *)(pvar) - __va_rounded_size (TYPE)))));})) -#else // _SPARC_ or _PARISC_ -// GCC 2.95.3 on non-SPARC -#define __va_size(type) (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int)) -#define va_start(list, v) ((list) = (va_list) __builtin_next_arg(v)) -#define va_arg(ap, type) (*(type *)((ap) += __va_size(type), (ap) - __va_size(type))) -#endif // _SPARC_ or _PARISC_ -#else // __GNUC__ == 2 #define va_start __builtin_va_start #define va_arg __builtin_va_arg -#endif // __GNUC__ == 2 #define va_copy __builtin_va_copy #define va_end __builtin_va_end -#endif // _AIX - #define VOID void #define PUB __attribute__((visibility("default"))) @@ -628,26 +529,6 @@ PAL_Random( IN OUT LPVOID lpBuffer, IN DWORD dwLength); -#ifdef PLATFORM_UNIX - -PALIMPORT -DWORD -PALAPI -PAL_CreateExecWatchpoint( - HANDLE hThread, - PVOID pvInstruction - ); - -PALIMPORT -DWORD -PALAPI -PAL_DeleteExecWatchpoint( - HANDLE hThread, - PVOID pvInstruction - ); - -#endif - PALIMPORT BOOL PALAPI @@ -1845,6 +1726,15 @@ QueueUserAPC( #define CONTEXT_EXCEPTION_REQUEST 0x40000000L #define CONTEXT_EXCEPTION_REPORTING 0x80000000L +// +// This flag is set by the unwinder if it has unwound to a call +// site, and cleared whenever it unwinds through a trap frame. +// It is used by language-specific exception handlers to help +// differentiate exception scopes during dispatching. +// + +#define CONTEXT_UNWOUND_TO_CALL 0x20000000 + typedef struct _FLOATING_SAVE_AREA { DWORD ControlWord; DWORD StatusWord; @@ -1905,658 +1795,21 @@ typedef struct _CONTEXT { typedef struct _KNONVOLATILE_CONTEXT_POINTERS { - // TODO WIP x86/Linux, need to fix this. - PDWORD Ebx; - PDWORD Esi; + // The ordering of these fields should be aligned with that + // of corresponding fields in CONTEXT + // + // (See FillRegDisplay in inc/regdisp.h for details) PDWORD Edi; + PDWORD Esi; + PDWORD Ebx; + PDWORD Edx; + PDWORD Ecx; + PDWORD Eax; + PDWORD Ebp; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; -#elif defined(_PPC_) - -// -// *********************************************************************************** -// -// NOTE: These context definitions are replicated in ndp/clr/src/debug/inc/DbgTargetContext.h (for the -// purposes manipulating contexts from different platforms during remote debugging). Be sure to keep those -// definitions in sync if you make any changes here. -// -// *********************************************************************************** -// - -#define CONTEXT_CONTROL 0x00000001L -#define CONTEXT_FLOATING_POINT 0x00000002L -#define CONTEXT_INTEGER 0x00000004L - -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) -#define CONTEXT_ALL CONTEXT_FULL - -typedef struct _CONTEXT { - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_FLOATING_POINT. - // - - double Fpr0; // Floating registers 0..31 - double Fpr1; - double Fpr2; - double Fpr3; - double Fpr4; - double Fpr5; - double Fpr6; - double Fpr7; - double Fpr8; - double Fpr9; - double Fpr10; - double Fpr11; - double Fpr12; - double Fpr13; - double Fpr14; - double Fpr15; - double Fpr16; - double Fpr17; - double Fpr18; - double Fpr19; - double Fpr20; - double Fpr21; - double Fpr22; - double Fpr23; - double Fpr24; - double Fpr25; - double Fpr26; - double Fpr27; - double Fpr28; - double Fpr29; - double Fpr30; - double Fpr31; - double Fpscr; // Floating point status/control reg - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_INTEGER. - // - - ULONG Gpr0; // General registers 0..31 - ULONG Gpr1; // StackPointer - ULONG Gpr2; - ULONG Gpr3; - ULONG Gpr4; - ULONG Gpr5; - ULONG Gpr6; - ULONG Gpr7; - ULONG Gpr8; - ULONG Gpr9; - ULONG Gpr10; - ULONG Gpr11; - ULONG Gpr12; - ULONG Gpr13; - ULONG Gpr14; - ULONG Gpr15; - ULONG Gpr16; - ULONG Gpr17; - ULONG Gpr18; - ULONG Gpr19; - ULONG Gpr20; - ULONG Gpr21; - ULONG Gpr22; - ULONG Gpr23; - ULONG Gpr24; - ULONG Gpr25; - ULONG Gpr26; - ULONG Gpr27; - ULONG Gpr28; - ULONG Gpr29; - ULONG Gpr30; - ULONG Gpr31; - - ULONG Cr; // Condition register - ULONG Xer; // Fixed point exception register - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_CONTROL. - // - - ULONG Msr; // Machine status register - ULONG Iar; // Instruction address register - ULONG Lr; // Link register - ULONG Ctr; // Count register - - // - // The flags values within this flag control the contents of - // a CONTEXT record. - // - // If the context record is used as an input parameter, then - // for each portion of the context record controlled by a flag - // whose value is set, it is assumed that that portion of the - // context record contains valid context. If the context record - // is being used to modify a thread's context, then only that - // portion of the threads context will be modified. - // - // If the context record is used as an IN OUT parameter to capture - // the context of a thread, then only those portions of the thread's - // context corresponding to set flags will be returned. - // - // The context record is never used as an OUT only parameter. - // - - ULONG ContextFlags; - - ULONG Fill[3]; // Pad out to multiple of 16 bytes - - // - // This section is specified/returned if CONTEXT_DEBUG_REGISTERS is - // set in ContextFlags. Note that CONTEXT_DEBUG_REGISTERS is NOT - // included in CONTEXT_FULL. - // - ULONG Dr0; // Breakpoint Register 1 - ULONG Dr1; // Breakpoint Register 2 - ULONG Dr2; // Breakpoint Register 3 - ULONG Dr3; // Breakpoint Register 4 - ULONG Dr4; // Breakpoint Register 5 - ULONG Dr5; // Breakpoint Register 6 - ULONG Dr6; // Debug Status Register - ULONG Dr7; // Debug Control Register - -} CONTEXT, *PCONTEXT, *LPCONTEXT; - -#elif defined(_SPARC_) - -#define CONTEXT_CONTROL 0x00000001L -#define CONTEXT_FLOATING_POINT 0x00000002L -#define CONTEXT_INTEGER 0x00000004L - -#define COUNT_FLOATING_REGISTER 32 -#define COUNT_DOUBLE_REGISTER 16 -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) -#define CONTEXT_ALL CONTEXT_FULL - -typedef struct _CONTEXT { - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_INTEGER. - // - ULONG g0; - ULONG g1; - ULONG g2; - ULONG g3; - ULONG g4; - ULONG g5; - ULONG g6; - ULONG g7; - ULONG o0; - ULONG o1; - ULONG o2; - ULONG o3; - ULONG o4; - ULONG o5; - ULONG sp; - ULONG o7; - ULONG l0; - ULONG l1; - ULONG l2; - ULONG l3; - ULONG l4; - ULONG l5; - ULONG l6; - ULONG l7; - ULONG i0; - ULONG i1; - ULONG i2; - ULONG i3; - ULONG i4; - ULONG i5; - ULONG fp; - ULONG i7; - - ULONG y; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_CONTROL. - // -#if defined(__sparcv9) - ULONG ccr; -#else - ULONG psr; -#endif - ULONG pc; // program counter - ULONG npc; // next address to be executed - - ULONG ContextFlags; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_FLOATING_POINT. - // - ULONGLONG fsr; - union { - float f[COUNT_FLOATING_REGISTER]; - double d[COUNT_DOUBLE_REGISTER]; - } fprs; - -} CONTEXT, *PCONTEXT, *LPCONTEXT; - -#elif defined(_PARISC_) - -// ToDo: Get this correct for PARISC architecture -#define CONTEXT_CONTROL 0x00000001L -#define CONTEXT_FLOATING_POINT 0x00000002L -#define CONTEXT_INTEGER 0x00000004L - -#define COUNT_FLOATING_REGISTER 32 -#define COUNT_DOUBLE_REGISTER 16 -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) -#define CONTEXT_ALL CONTEXT_FULL - -typedef struct _CONTEXT { - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_INTEGER. - // - ULONG g0; - ULONG g1; - ULONG g2; - ULONG g3; - ULONG g4; - ULONG g5; - ULONG g6; - ULONG g7; - ULONG o0; - ULONG o1; - ULONG o2; - ULONG o3; - ULONG o4; - ULONG o5; - ULONG sp; - ULONG o7; - ULONG l0; - ULONG l1; - ULONG l2; - ULONG l3; - ULONG l4; - ULONG l5; - ULONG l6; - ULONG l7; - ULONG i0; - ULONG i1; - ULONG i2; - ULONG i3; - ULONG i4; - ULONG i5; - ULONG fp; - ULONG i7; - - ULONG y; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_CONTROL. - // - ULONG psr; - ULONG pc; // program counter - ULONG npc; // next address to be executed - - ULONG ContextFlags; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_FLOATING_POINT. - // - ULONGLONG fsr; - union { - float f[COUNT_FLOATING_REGISTER]; - double d[COUNT_DOUBLE_REGISTER]; - } fprs; - -} CONTEXT, *PCONTEXT, *LPCONTEXT; - -#elif defined(_IA64_) - -// copied from winnt.h -typedef struct _FLOAT128 { - __int64 LowPart; - __int64 HighPart; -} FLOAT128; - -typedef FLOAT128 *PFLOAT128; - -// begin_ntddk begin_nthal - -// -// The following flags control the contents of the CONTEXT structure. -// - -#if !defined(RC_INVOKED) - -#define CONTEXT_IA64 0x00080000 - -#define CONTEXT_CONTROL (CONTEXT_IA64 | 0x00000001L) -#define CONTEXT_LOWER_FLOATING_POINT (CONTEXT_IA64 | 0x00000002L) -#define CONTEXT_HIGHER_FLOATING_POINT (CONTEXT_IA64 | 0x00000004L) -#define CONTEXT_INTEGER (CONTEXT_IA64 | 0x00000008L) -#define CONTEXT_DEBUG (CONTEXT_IA64 | 0x00000010L) -#define CONTEXT_IA32_CONTROL (CONTEXT_IA64 | 0x00000020L) // Includes StIPSR - - -#define CONTEXT_FLOATING_POINT (CONTEXT_LOWER_FLOATING_POINT | CONTEXT_HIGHER_FLOATING_POINT) -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER | CONTEXT_IA32_CONTROL) -#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER | CONTEXT_DEBUG | CONTEXT_IA32_CONTROL) - -#define CONTEXT_EXCEPTION_ACTIVE 0x8000000 -#define CONTEXT_SERVICE_ACTIVE 0x10000000 -#define CONTEXT_EXCEPTION_REQUEST 0x40000000 -#define CONTEXT_EXCEPTION_REPORTING 0x80000000 - -#endif // !defined(RC_INVOKED) - -// -// Context Frame -// -// This frame has a several purposes: 1) it is used as an argument to -// NtContinue, 2) it is used to construct a call frame for APC delivery, -// 3) it is used to construct a call frame for exception dispatching -// in user mode, 4) it is used in the user level thread creation -// routines, and 5) it is used to to pass thread state to debuggers. -// -// N.B. Because this record is used as a call frame, it must be EXACTLY -// a multiple of 16 bytes in length and aligned on a 16-byte boundary. -// - -typedef struct _CONTEXT { - - // - // The flags values within this flag control the contents of - // a CONTEXT record. - // - // If the context record is used as an input parameter, then - // for each portion of the context record controlled by a flag - // whose value is set, it is assumed that that portion of the - // context record contains valid context. If the context record - // is being used to modify a thread's context, then only that - // portion of the threads context will be modified. - // - // If the context record is used as an IN OUT parameter to capture - // the context of a thread, then only those portions of the thread's - // context corresponding to set flags will be returned. - // - // The context record is never used as an OUT only parameter. - // - - DWORD ContextFlags; - DWORD Fill1[3]; // for alignment of following on 16-byte boundary - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_DEBUG. - // - // N.B. CONTEXT_DEBUG is *not* part of CONTEXT_FULL. - // - - ULONGLONG DbI0; - ULONGLONG DbI1; - ULONGLONG DbI2; - ULONGLONG DbI3; - ULONGLONG DbI4; - ULONGLONG DbI5; - ULONGLONG DbI6; - ULONGLONG DbI7; - - ULONGLONG DbD0; - ULONGLONG DbD1; - ULONGLONG DbD2; - ULONGLONG DbD3; - ULONGLONG DbD4; - ULONGLONG DbD5; - ULONGLONG DbD6; - ULONGLONG DbD7; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_LOWER_FLOATING_POINT. - // - - FLOAT128 FltS0; - FLOAT128 FltS1; - FLOAT128 FltS2; - FLOAT128 FltS3; - FLOAT128 FltT0; - FLOAT128 FltT1; - FLOAT128 FltT2; - FLOAT128 FltT3; - FLOAT128 FltT4; - FLOAT128 FltT5; - FLOAT128 FltT6; - FLOAT128 FltT7; - FLOAT128 FltT8; - FLOAT128 FltT9; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_HIGHER_FLOATING_POINT. - // - - FLOAT128 FltS4; - FLOAT128 FltS5; - FLOAT128 FltS6; - FLOAT128 FltS7; - FLOAT128 FltS8; - FLOAT128 FltS9; - FLOAT128 FltS10; - FLOAT128 FltS11; - FLOAT128 FltS12; - FLOAT128 FltS13; - FLOAT128 FltS14; - FLOAT128 FltS15; - FLOAT128 FltS16; - FLOAT128 FltS17; - FLOAT128 FltS18; - FLOAT128 FltS19; - - FLOAT128 FltF32; - FLOAT128 FltF33; - FLOAT128 FltF34; - FLOAT128 FltF35; - FLOAT128 FltF36; - FLOAT128 FltF37; - FLOAT128 FltF38; - FLOAT128 FltF39; - - FLOAT128 FltF40; - FLOAT128 FltF41; - FLOAT128 FltF42; - FLOAT128 FltF43; - FLOAT128 FltF44; - FLOAT128 FltF45; - FLOAT128 FltF46; - FLOAT128 FltF47; - FLOAT128 FltF48; - FLOAT128 FltF49; - - FLOAT128 FltF50; - FLOAT128 FltF51; - FLOAT128 FltF52; - FLOAT128 FltF53; - FLOAT128 FltF54; - FLOAT128 FltF55; - FLOAT128 FltF56; - FLOAT128 FltF57; - FLOAT128 FltF58; - FLOAT128 FltF59; - - FLOAT128 FltF60; - FLOAT128 FltF61; - FLOAT128 FltF62; - FLOAT128 FltF63; - FLOAT128 FltF64; - FLOAT128 FltF65; - FLOAT128 FltF66; - FLOAT128 FltF67; - FLOAT128 FltF68; - FLOAT128 FltF69; - - FLOAT128 FltF70; - FLOAT128 FltF71; - FLOAT128 FltF72; - FLOAT128 FltF73; - FLOAT128 FltF74; - FLOAT128 FltF75; - FLOAT128 FltF76; - FLOAT128 FltF77; - FLOAT128 FltF78; - FLOAT128 FltF79; - - FLOAT128 FltF80; - FLOAT128 FltF81; - FLOAT128 FltF82; - FLOAT128 FltF83; - FLOAT128 FltF84; - FLOAT128 FltF85; - FLOAT128 FltF86; - FLOAT128 FltF87; - FLOAT128 FltF88; - FLOAT128 FltF89; - - FLOAT128 FltF90; - FLOAT128 FltF91; - FLOAT128 FltF92; - FLOAT128 FltF93; - FLOAT128 FltF94; - FLOAT128 FltF95; - FLOAT128 FltF96; - FLOAT128 FltF97; - FLOAT128 FltF98; - FLOAT128 FltF99; - - FLOAT128 FltF100; - FLOAT128 FltF101; - FLOAT128 FltF102; - FLOAT128 FltF103; - FLOAT128 FltF104; - FLOAT128 FltF105; - FLOAT128 FltF106; - FLOAT128 FltF107; - FLOAT128 FltF108; - FLOAT128 FltF109; - - FLOAT128 FltF110; - FLOAT128 FltF111; - FLOAT128 FltF112; - FLOAT128 FltF113; - FLOAT128 FltF114; - FLOAT128 FltF115; - FLOAT128 FltF116; - FLOAT128 FltF117; - FLOAT128 FltF118; - FLOAT128 FltF119; - - FLOAT128 FltF120; - FLOAT128 FltF121; - FLOAT128 FltF122; - FLOAT128 FltF123; - FLOAT128 FltF124; - FLOAT128 FltF125; - FLOAT128 FltF126; - FLOAT128 FltF127; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_LOWER_FLOATING_POINT | CONTEXT_HIGHER_FLOATING_POINT | CONTEXT_CONTROL. - // - - ULONGLONG StFPSR; // FP status - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_INTEGER. - // - // N.B. The registers gp, sp, rp are part of the control context - // - - ULONGLONG IntGp; // r1, volatile - ULONGLONG IntT0; // r2-r3, volatile - ULONGLONG IntT1; // - ULONGLONG IntS0; // r4-r7, preserved - ULONGLONG IntS1; - ULONGLONG IntS2; - ULONGLONG IntS3; - ULONGLONG IntV0; // r8, volatile - ULONGLONG IntT2; // r9-r11, volatile - ULONGLONG IntT3; - ULONGLONG IntT4; - ULONGLONG IntSp; // stack pointer (r12), special - ULONGLONG IntTeb; // teb (r13), special - ULONGLONG IntT5; // r14-r31, volatile - ULONGLONG IntT6; - ULONGLONG IntT7; - ULONGLONG IntT8; - ULONGLONG IntT9; - ULONGLONG IntT10; - ULONGLONG IntT11; - ULONGLONG IntT12; - ULONGLONG IntT13; - ULONGLONG IntT14; - ULONGLONG IntT15; - ULONGLONG IntT16; - ULONGLONG IntT17; - ULONGLONG IntT18; - ULONGLONG IntT19; - ULONGLONG IntT20; - ULONGLONG IntT21; - ULONGLONG IntT22; - - ULONGLONG IntNats; // Nat bits for r1-r31 - // r1-r31 in bits 1 thru 31. - ULONGLONG Preds; // predicates, preserved - - ULONGLONG BrRp; // return pointer, b0, preserved - ULONGLONG BrS0; // b1-b5, preserved - ULONGLONG BrS1; - ULONGLONG BrS2; - ULONGLONG BrS3; - ULONGLONG BrS4; - ULONGLONG BrT0; // b6-b7, volatile - ULONGLONG BrT1; - - // - // This section is specified/returned if the ContextFlags word contains - // the flag CONTEXT_CONTROL. - // - - // Other application registers - ULONGLONG ApUNAT; // User Nat collection register, preserved - ULONGLONG ApLC; // Loop counter register, preserved - ULONGLONG ApEC; // Epilog counter register, preserved - ULONGLONG ApCCV; // CMPXCHG value register, volatile - ULONGLONG ApDCR; // Default control register (TBD) - - // Register stack info - ULONGLONG RsPFS; // Previous function state, preserved - ULONGLONG RsBSP; // Backing store pointer, preserved - ULONGLONG RsBSPSTORE; - ULONGLONG RsRSC; // RSE configuration, volatile - ULONGLONG RsRNAT; // RSE Nat collection register, preserved - - // Trap Status Information - ULONGLONG StIPSR; // Interruption Processor Status - ULONGLONG StIIP; // Interruption IP - ULONGLONG StIFS; // Interruption Function State - - // iA32 related control registers - ULONGLONG StFCR; // copy of Ar21 - ULONGLONG Eflag; // Eflag copy of Ar24 - ULONGLONG SegCSD; // iA32 CSDescriptor (Ar25) - ULONGLONG SegSSD; // iA32 SSDescriptor (Ar26) - ULONGLONG Cflag; // Cr0+Cr4 copy of Ar27 - ULONGLONG StFSR; // x86 FP status (copy of AR28) - ULONGLONG StFIR; // x86 FP status (copy of AR29) - ULONGLONG StFDR; // x86 FP status (copy of AR30) - - ULONGLONG UNUSEDPACK; // added to pack StFDR to 16-bytes - -} CONTEXT, *PCONTEXT, *LPCONTEXT; #elif defined(_AMD64_) // copied from winnt.h @@ -3286,13 +2539,9 @@ PALIMPORT BOOL PALAPI PAL_VirtualUnwindOutOfProc(CONTEXT *context, #define GetLogicalProcessorCacheSizeFromOS PAL_GetLogicalProcessorCacheSizeFromOS -#ifdef PLATFORM_UNIX - /* PAL_CS_NATIVE_DATA_SIZE is defined as sizeof(PAL_CRITICAL_SECTION_NATIVE_DATA) */ -#if defined(_AIX) -#define PAL_CS_NATIVE_DATA_SIZE 100 -#elif defined(__APPLE__) && defined(__i386__) +#if defined(__APPLE__) && defined(__i386__) #define PAL_CS_NATIVE_DATA_SIZE 76 #elif defined(__APPLE__) && defined(__x86_64__) #define PAL_CS_NATIVE_DATA_SIZE 120 @@ -3300,8 +2549,6 @@ PALIMPORT BOOL PALAPI PAL_VirtualUnwindOutOfProc(CONTEXT *context, #define PAL_CS_NATIVE_DATA_SIZE 12 #elif defined(__FreeBSD__) && defined(__x86_64__) #define PAL_CS_NATIVE_DATA_SIZE 24 -#elif defined(__hpux__) && (defined(__hppa__) || defined (__ia64__)) -#define PAL_CS_NATIVE_DATA_SIZE 148 #elif defined(__linux__) && defined(_ARM_) #define PAL_CS_NATIVE_DATA_SIZE 80 #elif defined(__linux__) && defined(_ARM64_) @@ -3314,25 +2561,13 @@ PALIMPORT BOOL PALAPI PAL_VirtualUnwindOutOfProc(CONTEXT *context, #define PAL_CS_NATIVE_DATA_SIZE 96 #elif defined(__NetBSD__) && defined(__earm__) #define PAL_CS_NATIVE_DATA_SIZE 56 -#elif defined(__NetBSD__) && defined(__hppa__) -#define PAL_CS_NATIVE_DATA_SIZE 92 #elif defined(__NetBSD__) && defined(__i386__) #define PAL_CS_NATIVE_DATA_SIZE 56 -#elif defined(__NetBSD__) && defined(__mips__) -#define PAL_CS_NATIVE_DATA_SIZE 56 -#elif defined(__NetBSD__) && (defined(__sparc__) && !defined(__sparc64__)) -#define PAL_CS_NATIVE_DATA_SIZE 56 -#elif defined(__NetBSD__) && defined(__sparc64__) -#define PAL_CS_NATIVE_DATA_SIZE 92 -#elif defined(__sun__) -#define PAL_CS_NATIVE_DATA_SIZE 48 #else #warning #error PAL_CS_NATIVE_DATA_SIZE is not defined for this architecture #endif -#endif // PLATFORM_UNIX - // typedef struct _CRITICAL_SECTION { PVOID DebugInfo; @@ -3342,7 +2577,6 @@ typedef struct _CRITICAL_SECTION { HANDLE LockSemaphore; ULONG_PTR SpinCount; -#ifdef PLATFORM_UNIX BOOL bInternal; volatile DWORD dwInitState; union CSNativeDataStorage @@ -3350,7 +2584,6 @@ typedef struct _CRITICAL_SECTION { BYTE rgNativeDataStorage[PAL_CS_NATIVE_DATA_SIZE]; VOID * pvAlign; // make sure the storage is machine-pointer-size aligned } csnds; -#endif // PLATFORM_UNIX } CRITICAL_SECTION, *PCRITICAL_SECTION, *LPCRITICAL_SECTION; PALIMPORT VOID PALAPI EnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection); @@ -4554,33 +3787,6 @@ PAL_GetCalendar( #define GEOID_NOT_AVAILABLE -1 -// "a number", might represent different types -typedef struct PALNUMBER__* PALNUMBER; - -// return NULL on OOM -PALIMPORT PALNUMBER PALAPI PAL_DoubleToNumber(double); -PALIMPORT PALNUMBER PALAPI PAL_Int64ToNumber(INT64); -PALIMPORT PALNUMBER PALAPI PAL_UInt64ToNumber(UINT64); -PALIMPORT PALNUMBER PALAPI PAL_IntToNumber(int); -PALIMPORT PALNUMBER PALAPI PAL_UIntToNumber(unsigned int); - -PALIMPORT void PALAPI PAL_ReleaseNumber(PALNUMBER); - - -// return string length if Buffer is NULL or the result fits in cchBuffer, otherwise -1 -PALIMPORT int PALAPI PAL_FormatScientific(LPCWSTR sLocale, LPWSTR pBuffer, SIZE_T cchBuffer, PALNUMBER number, int nMinDigits, int nMaxDigits, - LPCWSTR sExponent, LPCWSTR sNumberDecimal, LPCWSTR sPositive, LPCWSTR sNegative, LPCWSTR sZero); - -PALIMPORT int PALAPI PAL_FormatCurrency(LPCWSTR sLocale, LPWSTR pBuffer, SIZE_T cchBuffer, PALNUMBER number, int nMinDigits, int nMaxDigits, int iNegativeFormat, int iPositiveFormat, - int iPrimaryGroup, int iSecondaryGroup, LPCWSTR sCurrencyDecimal, LPCWSTR sCurrencyGroup, LPCWSTR sNegative, LPCWSTR sCurrency, LPCWSTR sZero); - -PALIMPORT int PALAPI PAL_FormatPercent(LPCWSTR sLocale, LPWSTR pBuffer, SIZE_T cchBuffer, PALNUMBER number, int nMinDigits, int nMaxDigits,int iNegativeFormat, int iPositiveFormat, - int iPrimaryGroup, int iSecondaryGroup, LPCWSTR sPercentDecimal, LPCWSTR sPercentGroup, LPCWSTR sNegative, LPCWSTR sPercent, LPCWSTR sZero); - -PALIMPORT int PALAPI PAL_FormatDecimal(LPCWSTR sLocale, LPWSTR pBuffer, SIZE_T cchBuffer, PALNUMBER number, int nMinDigits, int nMaxDigits, int iNegativeFormat, - int iPrimaryGroup, int iSecondaryGroup, LPCWSTR sDecimal, LPCWSTR sGroup, LPCWSTR sNegative, LPCWSTR sZero); - - #define DATE_USE_ALT_CALENDAR 0x00000004 #if ENABLE_DOWNLEVEL_FOR_NLS @@ -4706,7 +3912,7 @@ enum { // typedef struct _RUNTIME_FUNCTION { DWORD BeginAddress; -#ifdef _AMD64_ +#ifdef _TARGET_AMD64_ DWORD EndAddress; #endif DWORD UnwindData; @@ -5660,14 +4866,12 @@ CoCreateGuid(OUT GUID * pguid); /* Some C runtime functions needs to be reimplemented by the PAL. To avoid name collisions, those functions have been renamed using defines */ -#ifdef PLATFORM_UNIX #ifndef PAL_STDCPP_COMPAT #define exit PAL_exit #define atexit PAL_atexit #define printf PAL_printf #define vprintf PAL_vprintf #define wprintf PAL_wprintf -#define swprintf PAL_swprintf #define wcsspn PAL_wcsspn #define wcstod PAL_wcstod #define wcstol PAL_wcstol @@ -5694,8 +4898,6 @@ CoCreateGuid(OUT GUID * pguid); #define iswxdigit PAL_iswxdigit #define towlower PAL_towlower #define towupper PAL_towupper -#define vsprintf PAL_vsprintf -#define vswprintf PAL_vswprintf #define realloc PAL_realloc #define fopen PAL_fopen #define strtok PAL_strtok @@ -5758,8 +4960,8 @@ CoCreateGuid(OUT GUID * pguid); #define _close PAL__close #define _wcstoui64 PAL__wcstoui64 #define _flushall PAL__flushall -#define _vsnprintf PAL__vsnprintf #define strnlen PAL_strnlen +#define wcsnlen PAL_wcsnlen #ifdef _AMD64_ #define _mm_getcsr PAL__mm_getcsr @@ -5767,7 +4969,6 @@ CoCreateGuid(OUT GUID * pguid); #endif // _AMD64_ #endif // !PAL_STDCPP_COMPAT -#endif // PLATFORM_UNIX #ifndef _CONST_RETURN #ifdef __cplusplus @@ -5836,7 +5037,6 @@ PALIMPORT char * __cdecl strstr(const char *, const char *); PALIMPORT char * __cdecl strtok(char *, const char *); PALIMPORT size_t __cdecl strspn(const char *, const char *); PALIMPORT size_t __cdecl strcspn(const char *, const char *); -PALIMPORT int __cdecl vsprintf(char *, const char *, va_list); PALIMPORT int __cdecl atoi(const char *); PALIMPORT LONG __cdecl atol(const char *); PALIMPORT ULONG __cdecl strtoul(const char *, char **, int); @@ -5900,7 +5100,6 @@ PALIMPORT WCHAR * __cdecl PAL_wcstok(WCHAR *, const WCHAR *); PALIMPORT size_t __cdecl PAL_wcscspn(const WCHAR *, const WCHAR *); PALIMPORT int __cdecl PAL_swprintf(WCHAR *, const WCHAR *, ...); PALIMPORT int __cdecl PAL_vswprintf(WCHAR *, const WCHAR *, va_list); -PALIMPORT int __cdecl PAL__vsnprintf(LPSTR Buffer, size_t Count, LPCSTR Format, va_list ap); PALIMPORT int __cdecl PAL_swscanf(const WCHAR *, const WCHAR *, ...); PALIMPORT LONG __cdecl PAL_wcstol(const WCHAR *, WCHAR **, int); PALIMPORT ULONG __cdecl PAL_wcstoul(const WCHAR *, WCHAR **, int); @@ -6048,17 +5247,11 @@ PALIMPORT char * __cdecl _strdup(const char *); #if defined(_MSC_VER) #define alloca _alloca -#elif defined(PLATFORM_UNIX) -#define _alloca alloca #else -// MingW -#define _alloca __builtin_alloca -#define alloca __builtin_alloca +#define _alloca alloca #endif //_MSC_VER -#if defined(__GNUC__) && defined(PLATFORM_UNIX) #define alloca __builtin_alloca -#endif // __GNUC__ #define max(a, b) (((a) > (b)) ? (a) : (b)) #define min(a, b) (((a) < (b)) ? (a) : (b)) @@ -6527,10 +5720,10 @@ public: } }; -typedef BOOL (PALAPI *PHARDWARE_EXCEPTION_HANDLER)(PAL_SEHException* ex); -typedef BOOL (PALAPI *PHARDWARE_EXCEPTION_SAFETY_CHECK_FUNCTION)(PCONTEXT contextRecord, PEXCEPTION_RECORD exceptionRecord); -typedef VOID (PALAPI *PTERMINATION_REQUEST_HANDLER)(); -typedef DWORD (PALAPI *PGET_GCMARKER_EXCEPTION_CODE)(LPVOID ip); +typedef BOOL (*PHARDWARE_EXCEPTION_HANDLER)(PAL_SEHException* ex); +typedef BOOL (*PHARDWARE_EXCEPTION_SAFETY_CHECK_FUNCTION)(PCONTEXT contextRecord, PEXCEPTION_RECORD exceptionRecord); +typedef VOID (*PTERMINATION_REQUEST_HANDLER)(); +typedef DWORD (*PGET_GCMARKER_EXCEPTION_CODE)(LPVOID ip); PALIMPORT VOID @@ -6819,24 +6012,13 @@ public: // Platform-specific library naming // -#ifdef PLATFORM_UNIX #ifdef __APPLE__ #define MAKEDLLNAME_W(name) u"lib" name u".dylib" #define MAKEDLLNAME_A(name) "lib" name ".dylib" -#elif defined(_AIX) -#define MAKEDLLNAME_W(name) L"lib" name L".a" -#define MAKEDLLNAME_A(name) "lib" name ".a" -#elif defined(__hppa__) || defined(_IA64_) -#define MAKEDLLNAME_W(name) L"lib" name L".sl" -#define MAKEDLLNAME_A(name) "lib" name ".sl" #else #define MAKEDLLNAME_W(name) u"lib" name u".so" #define MAKEDLLNAME_A(name) "lib" name ".so" #endif -#else -#define MAKEDLLNAME_W(name) name L".dll" -#define MAKEDLLNAME_A(name) name ".dll" -#endif #ifdef UNICODE #define MAKEDLLNAME(x) MAKEDLLNAME_W(x) @@ -6848,10 +6030,6 @@ public: #if __APPLE__ #define PAL_SHLIB_SUFFIX ".dylib" -#elif _AIX -#define PAL_SHLIB_SUFFIX ".a" -#elif _HPUX_ -#define PAL_SHLIB_SUFFIX ".sl" #else #define PAL_SHLIB_SUFFIX ".so" #endif diff --git a/src/pal/inc/pal_char16.h b/src/pal/inc/pal_char16.h index 4600cc7ff6..0697b23d43 100644 --- a/src/pal/inc/pal_char16.h +++ b/src/pal/inc/pal_char16.h @@ -27,12 +27,10 @@ This file is used to define the wchar_t type as a 16-bit type on Unix. // vc++, for whom wchar_t is already a typedef instead of a built-in. #ifndef PAL_STDCPP_COMPAT -#if defined (PLATFORM_UNIX) && defined(__GNUC__) #undef wchar_t #undef __WCHAR_TYPE__ #define __WCHAR_TYPE__ __wchar_16_cpp__ #define wchar_t __wchar_16_cpp__ -#endif // PLATFORM_UNIX // Set up the wchar_t type (which got preprocessed to __wchar_16_cpp__). // In C++11, the standard gives us char16_t, which is what we want (and matches types with u"") @@ -40,7 +38,6 @@ This file is used to define the wchar_t type as a 16-bit type on Unix. // **** WARNING: Linking C and C++ objects will break with -fstrict-aliasing with GCC/Clang // due to conditional typedef #if !defined(_WCHAR_T_DEFINED) || !defined(_MSC_VER) -#if defined (PLATFORM_UNIX) #if defined(__cplusplus) #undef __WCHAR_TYPE__ #define __WCHAR_TYPE__ char16_t @@ -50,7 +47,7 @@ typedef char16_t wchar_t; #define __WCHAR_TYPE__ unsigned short typedef unsigned short wchar_t; #endif // __cplusplus -#endif // PLATFORM_UNIX + #ifndef _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED #endif // !_WCHAR_T_DEFINED diff --git a/src/pal/inc/pal_mstypes.h b/src/pal/inc/pal_mstypes.h index b9c3ac2e4a..1f5c11def4 100644 --- a/src/pal/inc/pal_mstypes.h +++ b/src/pal/inc/pal_mstypes.h @@ -235,13 +235,8 @@ typedef long double LONG_DOUBLE; typedef void VOID; -#ifndef PLATFORM_UNIX -typedef long LONG; -typedef unsigned long ULONG; -#else typedef int LONG; // NOTE: diff from windows.h, for LP64 compat typedef unsigned int ULONG; // NOTE: diff from windows.h, for LP64 compat -#endif typedef __int64 LONGLONG; typedef unsigned __int64 ULONGLONG; @@ -260,12 +255,7 @@ typedef UCHAR *PUCHAR; typedef char *PSZ; typedef ULONGLONG DWORDLONG; -#ifndef PLATFORM_UNIX -typedef unsigned long DWORD; -#else typedef unsigned int DWORD; // NOTE: diff from windows.h, for LP64 compat -#endif - typedef unsigned int DWORD32, *PDWORD32; typedef int BOOL; diff --git a/src/pal/inc/rt/intsafe.h b/src/pal/inc/rt/intsafe.h index 2ab2cf1550..4ed70e7423 100644 --- a/src/pal/inc/rt/intsafe.h +++ b/src/pal/inc/rt/intsafe.h @@ -38,47 +38,6 @@ UnsignedMultiply128 ( #endif #endif // _AMD64_ -#ifndef FEATURE_PAL - -#ifdef _WIN64 -typedef unsigned __int64 size_t; -typedef unsigned __int64 UINT_PTR; -typedef unsigned __int64 ULONG_PTR; -typedef unsigned __int64 DWORD_PTR; -typedef unsigned __int64 SIZE_T; -#else -typedef __w64 unsigned int size_t; -typedef __w64 unsigned int UINT_PTR; -typedef __w64 unsigned long ULONG_PTR; -typedef __w64 unsigned long DWORD_PTR; -typedef __w64 unsigned long SIZE_T; -#endif -typedef char CHAR; -typedef int INT; -typedef long LONG; -typedef unsigned char UCHAR; -typedef unsigned short USHORT; -typedef unsigned short WORD; -typedef unsigned int UINT; -typedef unsigned long ULONG; -typedef unsigned long DWORD; -typedef unsigned __int64 ULONGLONG; - - -typedef LONG HRESULT; - -#ifndef SUCCEEDED -#define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) -#endif - -#ifndef FAILED -#define FAILED(hr) (((HRESULT)(hr)) < 0) -#endif - -#define S_OK ((HRESULT)0x00000000L) - -#endif // !FEATURE_PAL - #define INTSAFE_E_ARITHMETIC_OVERFLOW ((HRESULT)0x80070216L) // 0x216 = 534 = ERROR_ARITHMETIC_OVERFLOW #ifndef LOWORD @@ -93,8 +52,7 @@ typedef LONG HRESULT; #define LODWORD(_qw) ((ULONG)(_qw)) #if defined(MIDL_PASS) || defined(RC_INVOKED) || defined(_M_CEE_PURE) \ - || defined(_68K_) || defined(_MPPC_) || defined(_PPC_) \ - || defined(_M_IA64) || defined(_M_AMD64) || defined(__ARM_ARCH) + || defined(_M_AMD64) || defined(__ARM_ARCH) #ifndef UInt32x32To64 #define UInt32x32To64(a, b) ((unsigned __int64)((ULONG)(a)) * (unsigned __int64)((ULONG)(b))) diff --git a/src/pal/inc/rt/palrt.h b/src/pal/inc/rt/palrt.h index c181f38c2b..059d3a68a5 100644 --- a/src/pal/inc/rt/palrt.h +++ b/src/pal/inc/rt/palrt.h @@ -223,19 +223,11 @@ inline void *__cdecl operator new(size_t, void *_P) // PAL_safe_offsetof is a version of offsetof that protects against an // overridden operator& -#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 5 || __GNUC__ > 3) #define FIELD_OFFSET(type, field) __builtin_offsetof(type, field) #ifndef offsetof #define offsetof(type, field) __builtin_offsetof(type, field) #endif #define PAL_safe_offsetof(type, field) __builtin_offsetof(type, field) -#else -#define FIELD_OFFSET(type, field) (((LONG)(LONG_PTR)&(((type *)64)->field)) - 64) -#ifndef offsetof -#define offsetof(s,m) ((size_t)((ptrdiff_t)&(((s *)64)->m)) - 64) -#endif -#define PAL_safe_offsetof(s,m) ((size_t)((ptrdiff_t)&(char&)(((s *)64)->m))-64) -#endif #define CONTAINING_RECORD(address, type, field) \ ((type *)((LONG_PTR)(address) - FIELD_OFFSET(type, field))) @@ -243,7 +235,7 @@ inline void *__cdecl operator new(size_t, void *_P) #define ARGUMENT_PRESENT(ArgumentPointer) (\ (CHAR *)(ArgumentPointer) != (CHAR *)(NULL) ) -#if defined(_WIN64) || defined(_M_ALPHA) +#if defined(_WIN64) #define MAX_NATURAL_ALIGNMENT sizeof(ULONGLONG) #else #define MAX_NATURAL_ALIGNMENT sizeof(ULONG) @@ -893,7 +885,6 @@ Remember to fix the errcode defintion in safecrt.h. */ #define _wcslwr_s _wcslwr_unsafe -#define _snprintf_s _snprintf_unsafe #define swscanf_s swscanf #define _wfopen_s _wfopen_unsafe @@ -903,8 +894,6 @@ Remember to fix the errcode defintion in safecrt.h. #define _vscprintf _vscprintf_unsafe -#define vsprintf_s _vsnprintf - extern "C++" { #include @@ -959,8 +948,11 @@ inline int __cdecl _vscprintf_unsafe(const char *_Format, va_list _ArgList) if(buf == nullptr) return 0; - int ret = _vsnprintf(buf, guess, _Format, _ArgList); + va_list argListCopy; + va_copy(argListCopy, _ArgList); + int ret = _vsnprintf_s(buf, guess, _TRUNCATE, _Format, argListCopy); free(buf); + va_end(argListCopy); if ((ret != -1) && (ret < guess)) return ret; @@ -969,28 +961,6 @@ inline int __cdecl _vscprintf_unsafe(const char *_Format, va_list _ArgList) } } -inline int __cdecl _vsnprintf_unsafe(char *_Dst, size_t _SizeInWords, size_t _Count, const char *_Format, va_list _ArgList) -{ - if (_Count == _TRUNCATE) _Count = _SizeInWords - 1; - int ret = _vsnprintf(_Dst, _Count, _Format, _ArgList); - _Dst[_SizeInWords - 1] = L'\0'; - if (ret < 0 && errno == 0) - { - errno = ERANGE; - } - return ret; -} - -inline int __cdecl _snprintf_unsafe(char *_Dst, size_t _SizeInWords, size_t _Count, const char *_Format, ...) -{ - int ret; - va_list _ArgList; - va_start(_ArgList, _Format); - ret = _vsnprintf_unsafe(_Dst, _SizeInWords, _Count, _Format, _ArgList); - va_end(_ArgList); - return ret; -} - inline errno_t __cdecl _wfopen_unsafe(PAL_FILE * *ff, const WCHAR *fileName, const WCHAR *mode) { PAL_FILE *result = _wfopen(fileName, mode); @@ -1208,7 +1178,6 @@ typedef VOID (__stdcall *WAITORTIMERCALLBACK)(PVOID, BOOLEAN); #define _ReturnAddress() __builtin_return_address(0) -#ifdef PLATFORM_UNIX #define DIRECTORY_SEPARATOR_CHAR_A '/' #define DIRECTORY_SEPARATOR_CHAR_W W('/') #define DIRECTORY_SEPARATOR_STR_A "/" @@ -1216,15 +1185,6 @@ typedef VOID (__stdcall *WAITORTIMERCALLBACK)(PVOID, BOOLEAN); #define PATH_SEPARATOR_CHAR_W W(':') #define PATH_SEPARATOR_STR_W W(":") #define VOLUME_SEPARATOR_CHAR_W W('/') -#else // PLATFORM_UNIX -#define DIRECTORY_SEPARATOR_CHAR_A '\\' -#define DIRECTORY_SEPARATOR_CHAR_W W('\\') -#define DIRECTORY_SEPARATOR_STR_A "\\" -#define DIRECTORY_SEPARATOR_STR_W W("\\") -#define PATH_SEPARATOR_CHAR_W W(';') -#define PATH_SEPARATOR_STR_W W(";") -#define VOLUME_SEPARATOR_CHAR_W W(':') -#endif // PLATFORM_UNIX #ifndef IMAGE_IMPORT_DESC_FIELD #define IMAGE_IMPORT_DESC_FIELD(img, f) ((img).u.f) @@ -1546,6 +1506,7 @@ typedef struct _DISPATCHER_CONTEXT { PEXCEPTION_ROUTINE LanguageHandler; PVOID HandlerData; PUNWIND_HISTORY_TABLE HistoryTable; + BOOLEAN ControlPcIsUnwound; } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; #else diff --git a/src/pal/inc/rt/safecrt.h b/src/pal/inc/rt/safecrt.h index 3cc10cef33..92366dfc38 100644 --- a/src/pal/inc/rt/safecrt.h +++ b/src/pal/inc/rt/safecrt.h @@ -135,11 +135,7 @@ typedef _W64 unsigned int uintptr_t; #define _UINTPTR_T_DEFINED #endif -#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ >= 3)) #define SAFECRT_DEPRECATED __declspec(deprecated) -#else -#define SAFECRT_DEPRECATED -#endif /* errno_t */ #if !defined(_ERRCODE_DEFINED) @@ -3253,10 +3249,6 @@ int __cdecl vswprintf_s(WCHAR (&_Dst)[_SizeInWords], const WCHAR *_Format, va_li * return -1 if the formatted string does not entirely fit into _Dst (we will not call _SAFECRT_INVALID_PARAMETER); * if _Count == 0, then (_Dst == nullptr && _SizeInBytes == 0) is allowed */ -_SAFECRT__EXTERN_C -int __cdecl _snprintf_s(char *_Dst, size_t _SizeInBytes, size_t _Count, const char *_Format, ...); -_SAFECRT__EXTERN_C -int __cdecl _vsnprintf_s(char *_Dst, size_t _SizeInBytes, size_t _Count, const char *_Format, va_list _ArgList); #if defined(__cplusplus) && _SAFECRT_USE_CPP_OVERLOADS template diff --git a/src/pal/inc/rt/sal.h b/src/pal/inc/rt/sal.h index 0e3eaaa388..07468645a5 100644 --- a/src/pal/inc/rt/sal.h +++ b/src/pal/inc/rt/sal.h @@ -2861,7 +2861,7 @@ of each annotation, see the advanced annotations section. #define __success(expr) _Success_(expr) #define __nullterminated _Null_terminated_ #define __nullnullterminated -#define __reserved _SAL1_Source_(__reserved, (), _Reserved_) +#define __clr_reserved _SAL1_Source_(__reserved, (), _Reserved_) #define __checkReturn _SAL1_Source_(__checkReturn, (), _Check_return_) #define __typefix(ctype) _SAL1_Source_(__typefix, (ctype), __inner_typefix(ctype)) #define __override __inner_override diff --git a/src/pal/inc/rt/specstrings_strict.h b/src/pal/inc/rt/specstrings_strict.h index 514106eedf..08d323c589 100644 --- a/src/pal/inc/rt/specstrings_strict.h +++ b/src/pal/inc/rt/specstrings_strict.h @@ -626,7 +626,7 @@ #define __in_awcount(expr,size) __allowed(on_parameter) #define __nullterminated _SAL_VERSION_CHECK(__nullterminated) #define __nullnullterminated _SAL_VERSION_CHECK(__nullnullterminated) -#define __reserved _SAL_VERSION_CHECK(__reserved) +#define __clr_reserved _SAL_VERSION_CHECK(__reserved) #define __checkReturn _SAL_VERSION_CHECK(__checkReturn) #define __typefix(ctype) __allowed(on_parameter_or_return) #define __override __allowed(on_function) diff --git a/src/pal/inc/rt/specstrings_undef.h b/src/pal/inc/rt/specstrings_undef.h index b462dc2e25..69fc01c15d 100644 --- a/src/pal/inc/rt/specstrings_undef.h +++ b/src/pal/inc/rt/specstrings_undef.h @@ -445,7 +445,7 @@ #undef __readableTo #undef __readonly #undef __refparam -#undef __reserved +#undef __clr_reserved #undef __rpc_entry #undef __source_code_content #undef __struct_bcount diff --git a/src/pal/inc/rt/vsassert.h b/src/pal/inc/rt/vsassert.h index 1f16cf1be7..2a7fa5fd92 100644 --- a/src/pal/inc/rt/vsassert.h +++ b/src/pal/inc/rt/vsassert.h @@ -11,10 +11,6 @@ #ifndef __VSASSERT_H__ #define __VSASSERT_H__ -#ifndef FEATURE_PAL -#error "FEATURE_PAL must be defined for this file" -#else // FEATURE_PAL - #define VSASSERT(e, szMsg) \ do { \ if (!(e)) { \ @@ -94,5 +90,4 @@ do { \ #define VsIgnoreAllocs(f) -#endif // FEATURE_PAL #endif // __VSASSERT_H__ diff --git a/src/pal/inc/strsafe.h b/src/pal/inc/strsafe.h index 58749f27ee..f32f5e6549 100644 --- a/src/pal/inc/strsafe.h +++ b/src/pal/inc/strsafe.h @@ -24,14 +24,6 @@ #pragma once #endif -#if defined(PLATFORM_UNIX) && !defined (FEATURE_PAL) -#define _NATIVE_WCHAR_T_DEFINED -#endif // defined(PLATFORM_UNIX) && !defined (FEATURE_PAL) - -#if defined(PLATFORM_UNIX) && !defined (FEATURE_PAL) -#define _vsnprintf vsnprintf -#endif // defined(PLATFORM_UNIX) && !defined (FEATURE_PAL) - #include // for _vsnprintf, getc, getwc #include // for memset #include // for va_start, etc. @@ -51,13 +43,6 @@ typedef char16_t WCHAR; #define _WCHAR_T_DEFINED #endif -#ifndef FEATURE_PAL -#ifndef _HRESULT_DEFINED -#define _HRESULT_DEFINED -typedef LONG HRESULT; -#endif // !_HRESULT_DEFINED -#endif // !FEATURE_PAL - #ifndef SUCCEEDED #define SUCCEEDED(hr) ((HRESULT)(hr) >= 0) #endif @@ -150,14 +135,6 @@ STRSAFEAPI StringLengthWorkerA(const char* psz, size_t cchMax, size_t* pcch); STRSAFEAPI StringLengthWorkerW(const WCHAR* psz, size_t cchMax, size_t* pcch); #endif // STRSAFE_INLINE -#ifndef STRSAFE_LIB_IMPL -#ifndef FEATURE_PAL -// these functions are always inline -STRSAFE_INLINE_API StringGetsExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags); -STRSAFE_INLINE_API StringGetsExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags); -#endif // !FEATURE_PAL -#endif - #ifndef STRSAFE_NO_CCH_FUNCTIONS /*++ @@ -247,7 +224,6 @@ STRSAFEAPI StringCchCopyA(char* pszDest, size_t cchDest, const char* pszSrc) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCopyW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) { HRESULT hr; @@ -263,7 +239,6 @@ STRSAFEAPI StringCchCopyW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -361,7 +336,6 @@ STRSAFEAPI StringCbCopyA(char* pszDest, size_t cbDest, const char* pszSrc) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCopyW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc) { HRESULT hr; @@ -381,7 +355,6 @@ STRSAFEAPI StringCbCopyW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -506,7 +479,6 @@ STRSAFEAPI StringCchCopyExA(char* pszDest, size_t cchDest, const char* pszSrc, c return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCopyExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr; @@ -527,7 +499,6 @@ STRSAFEAPI StringCchCopyExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -660,7 +631,6 @@ STRSAFEAPI StringCbCopyExA(char* pszDest, size_t cbDest, const char* pszSrc, cha return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCopyExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, WCHAR** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags) { HRESULT hr; @@ -689,7 +659,6 @@ STRSAFEAPI StringCbCopyExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, W return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -784,7 +753,6 @@ STRSAFEAPI StringCchCopyNA(char* pszDest, size_t cchDest, const char* pszSrc, si return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCopyNW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, size_t cchSrc) { HRESULT hr; @@ -801,7 +769,6 @@ STRSAFEAPI StringCchCopyNW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -902,7 +869,6 @@ STRSAFEAPI StringCbCopyNA(char* pszDest, size_t cbDest, const char* pszSrc, size return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCopyNW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, size_t cbSrc) { HRESULT hr; @@ -925,7 +891,6 @@ STRSAFEAPI StringCbCopyNW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, si return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -1060,7 +1025,6 @@ STRSAFEAPI StringCchCopyNExA(char* pszDest, size_t cchDest, const char* pszSrc, return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCopyNExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, size_t cchSrc, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr; @@ -1082,7 +1046,6 @@ STRSAFEAPI StringCchCopyNExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -1226,7 +1189,6 @@ STRSAFEAPI StringCbCopyNExA(char* pszDest, size_t cbDest, const char* pszSrc, si return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCopyNExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, size_t cbSrc, WCHAR** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags) { HRESULT hr; @@ -1258,7 +1220,6 @@ STRSAFEAPI StringCbCopyNExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -1345,7 +1306,6 @@ STRSAFEAPI StringCchCatA(char* pszDest, size_t cchDest, const char* pszSrc) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCatW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) { HRESULT hr; @@ -1361,7 +1321,6 @@ STRSAFEAPI StringCchCatW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -1451,7 +1410,6 @@ STRSAFEAPI StringCbCatA(char* pszDest, size_t cbDest, const char* pszSrc) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCatW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc) { HRESULT hr; @@ -1470,7 +1428,6 @@ STRSAFEAPI StringCbCatW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -1598,7 +1555,6 @@ STRSAFEAPI StringCchCatExA(char* pszDest, size_t cchDest, const char* pszSrc, ch return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCatExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr; @@ -1619,7 +1575,6 @@ STRSAFEAPI StringCchCatExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -1755,7 +1710,6 @@ STRSAFEAPI StringCbCatExA(char* pszDest, size_t cbDest, const char* pszSrc, char return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCatExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, WCHAR** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags) { HRESULT hr; @@ -1784,7 +1738,6 @@ STRSAFEAPI StringCbCatExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, WC return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -1877,7 +1830,6 @@ STRSAFEAPI StringCchCatNA(char* pszDest, size_t cchDest, const char* pszSrc, siz return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCatNW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, size_t cchMaxAppend) { HRESULT hr; @@ -1893,7 +1845,6 @@ STRSAFEAPI StringCchCatNW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, s return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -1993,7 +1944,6 @@ STRSAFEAPI StringCbCatNA(char* pszDest, size_t cbDest, const char* pszSrc, size_ return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCatNW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, size_t cbMaxAppend) { HRESULT hr; @@ -2016,7 +1966,6 @@ STRSAFEAPI StringCbCatNW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, siz return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -2147,7 +2096,6 @@ STRSAFEAPI StringCchCatNExA(char* pszDest, size_t cchDest, const char* pszSrc, s return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchCatNExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, size_t cchMaxAppend, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr; @@ -2168,7 +2116,6 @@ STRSAFEAPI StringCchCatNExW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -2311,7 +2258,6 @@ STRSAFEAPI StringCbCatNExA(char* pszDest, size_t cbDest, const char* pszSrc, siz return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbCatNExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, size_t cbMaxAppend, WCHAR** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags) { HRESULT hr; @@ -2344,7 +2290,6 @@ STRSAFEAPI StringCbCatNExW(WCHAR* pszDest, size_t cbDest, const WCHAR* pszSrc, s return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -2403,62 +2348,7 @@ Return Value: --*/ -#ifndef FEATURE_PAL -#ifndef STRSAFE_LIB_IMPL -STRSAFE_INLINE_API StringCchGetsA(char* pszDest, size_t cchDest); -STRSAFE_INLINE_API StringCchGetsW(WCHAR* pszDest, size_t cchDest); -#ifdef UNICODE -#define StringCchGets StringCchGetsW -#else -#define StringCchGets StringCchGetsA -#endif // !UNICODE - -STRSAFE_INLINE_API StringCchGetsA(char* pszDest, size_t cchDest) -{ - HRESULT hr; - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - size_t cbDest; - - // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1 - cbDest = cchDest * sizeof(char); - - hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, NULL, NULL, 0); - } - - return hr; -} - -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) -STRSAFE_INLINE_API StringCchGetsW(WCHAR* pszDest, size_t cchDest) -{ - HRESULT hr; - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - size_t cbDest; - - // safe to multiply cchDest * sizeof(WCHAR) since cchDest < STRSAFE_MAX_CCH and sizeof(WCHAR) is 2 - cbDest = cchDest * sizeof(WCHAR); - - hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, NULL, NULL, 0); - } - - return hr; -} -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // !STRSAFE_NO_CCH_FUNCTIONS -#endif // !STRSAFE_LIB_IMPL -#endif // !FEATURE_PAL #ifndef STRSAFE_NO_CB_FUNCTIONS /*++ @@ -2514,60 +2404,7 @@ Return Value: --*/ -#ifndef FEATURE_PAL -#ifndef STRSAFE_LIB_IMPL -STRSAFE_INLINE_API StringCbGetsA(char* pszDest, size_t cbDest); -STRSAFE_INLINE_API StringCbGetsW(WCHAR* pszDest, size_t cbDest); -#ifdef UNICODE -#define StringCbGets StringCbGetsW -#else -#define StringCbGets StringCbGetsA -#endif // !UNICODE - -STRSAFE_INLINE_API StringCbGetsA(char* pszDest, size_t cbDest) -{ - HRESULT hr; - size_t cchDest; - - // convert to count of characters - cchDest = cbDest / sizeof(char); - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, NULL, NULL, 0); - } - - return hr; -} - -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) -STRSAFE_INLINE_API StringCbGetsW(WCHAR* pszDest, size_t cbDest) -{ - HRESULT hr; - size_t cchDest; - - // convert to count of characters - cchDest = cbDest / sizeof(WCHAR); - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, NULL, NULL, 0); - } - - return hr; -} -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // !STRSAFE_NO_CB_FUNCTIONS -#endif // !STRSAFE_LIB_IMPL -#endif // !FEATURE_PAL #ifndef STRSAFE_NO_CCH_FUNCTIONS /*++ @@ -2650,62 +2487,7 @@ Return Value: --*/ -#ifndef FEATURE_PAL -#ifndef STRSAFE_LIB_IMPL -STRSAFE_INLINE_API StringCchGetsExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags); -STRSAFE_INLINE_API StringCchGetsExW(WCHAR* pszDest, size_t cchDest, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags); -#ifdef UNICODE -#define StringCchGetsEx StringCchGetsExW -#else -#define StringCchGetsEx StringCchGetsExA -#endif // !UNICODE - -STRSAFE_INLINE_API StringCchGetsExA(char* pszDest, size_t cchDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) -{ - HRESULT hr; - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - size_t cbDest; - - // safe to multiply cchDest * sizeof(char) since cchDest < STRSAFE_MAX_CCH and sizeof(char) is 1 - cbDest = cchDest * sizeof(char); - - hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags); - } - - return hr; -} - -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) -STRSAFE_INLINE_API StringCchGetsExW(WCHAR* pszDest, size_t cchDest, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) -{ - HRESULT hr; - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - size_t cbDest; - - // safe to multiply cchDest * sizeof(WCHAR) since cchDest < STRSAFE_MAX_CCH and sizeof(WCHAR) is 2 - cbDest = cchDest * sizeof(WCHAR); - - hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags); - } - - return hr; -} -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // !STRSAFE_NO_CCH_FUNCTIONS -#endif // !STRSAFE_LIB_IMPL -#endif // !FEATURE_PAL #ifndef STRSAFE_NO_CB_FUNCTIONS /*++ @@ -2788,82 +2570,7 @@ Return Value: --*/ -#ifndef FEATURE_PAL -#ifndef STRSAFE_LIB_IMPL -STRSAFE_INLINE_API StringCbGetsExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pbRemaining, unsigned long dwFlags); -STRSAFE_INLINE_API StringCbGetsExW(WCHAR* pszDest, size_t cbDest, WCHAR** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags); -#ifdef UNICODE -#define StringCbGetsEx StringCbGetsExW -#else -#define StringCbGetsEx StringCbGetsExA -#endif // !UNICODE - -STRSAFE_INLINE_API StringCbGetsExA(char* pszDest, size_t cbDest, char** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags) -{ - HRESULT hr; - size_t cchDest; - size_t cchRemaining = 0; - - cchDest = cbDest / sizeof(char); - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags); - } - - if (SUCCEEDED(hr) || - (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || - (hr == STRSAFE_E_END_OF_FILE)) - { - if (pcbRemaining) - { - // safe to multiply cchRemaining * sizeof(char) since cchRemaining < STRSAFE_MAX_CCH and sizeof(char) is 1 - *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); - } - } - - return hr; -} - -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) -STRSAFE_INLINE_API StringCbGetsExW(WCHAR* pszDest, size_t cbDest, WCHAR** ppszDestEnd, size_t* pcbRemaining, unsigned long dwFlags) -{ - HRESULT hr; - size_t cchDest; - size_t cchRemaining = 0; - - cchDest = cbDest / sizeof(WCHAR); - - if (cchDest > STRSAFE_MAX_CCH) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags); - } - - if (SUCCEEDED(hr) || - (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || - (hr == STRSAFE_E_END_OF_FILE)) - { - if (pcbRemaining) - { - // safe to multiply cchRemaining * sizeof(WCHAR) since cchRemaining < STRSAFE_MAX_CCH and sizeof(WCHAR) is 2 - *pcbRemaining = (cchRemaining * sizeof(WCHAR)) + (cbDest % sizeof(WCHAR)); - } - } - - return hr; -} -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // !STRSAFE_NO_CB_FUNCTIONS -#endif // !STRSAFE_LIB_IMPL -#endif // !FEATURE_PAL #ifndef STRSAFE_NO_CCH_FUNCTIONS /*++ @@ -2937,7 +2644,6 @@ STRSAFEAPI StringCchLengthA(const char* psz, size_t cchMax, size_t* pcch) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCchLengthW(const WCHAR* psz, size_t cchMax, size_t* pcch) { HRESULT hr; @@ -2953,7 +2659,6 @@ STRSAFEAPI StringCchLengthW(const WCHAR* psz, size_t cchMax, size_t* pcch) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CCH_FUNCTIONS @@ -3040,7 +2745,6 @@ STRSAFEAPI StringCbLengthA(const char* psz, size_t cbMax, size_t* pcb) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCbLengthW(const WCHAR* psz, size_t cbMax, size_t* pcb) { HRESULT hr; @@ -3066,7 +2770,6 @@ STRSAFEAPI StringCbLengthW(const WCHAR* psz, size_t cbMax, size_t* pcb) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE #endif // !STRSAFE_NO_CB_FUNCTIONS @@ -3103,7 +2806,6 @@ STRSAFEAPI StringCopyWorkerA(char* pszDest, size_t cchDest, const char* pszSrc) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCopyWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) { HRESULT hr = S_OK; @@ -3133,7 +2835,6 @@ STRSAFEAPI StringCopyWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCopyExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { @@ -3273,7 +2974,6 @@ STRSAFEAPI StringCopyExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, con return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCopyExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, const WCHAR* pszSrc, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr = S_OK; @@ -3411,7 +3111,6 @@ STRSAFEAPI StringCopyExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, co return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCopyNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchSrc) { @@ -3444,7 +3143,6 @@ STRSAFEAPI StringCopyNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCopyNWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, size_t cchSrc) { HRESULT hr = S_OK; @@ -3475,7 +3173,6 @@ STRSAFEAPI StringCopyNWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSr return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCopyNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, size_t cchSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { @@ -3616,7 +3313,6 @@ STRSAFEAPI StringCopyNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, co return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCopyNExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, const WCHAR* pszSrc, size_t cchSrc, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr = S_OK; @@ -3755,7 +3451,6 @@ STRSAFEAPI StringCopyNExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, c return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCatWorkerA(char* pszDest, size_t cchDest, const char* pszSrc) { @@ -3774,7 +3469,6 @@ STRSAFEAPI StringCatWorkerA(char* pszDest, size_t cchDest, const char* pszSrc) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCatWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) { HRESULT hr; @@ -3791,7 +3485,6 @@ STRSAFEAPI StringCatWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCatExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { @@ -3940,7 +3633,6 @@ STRSAFEAPI StringCatExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, cons return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCatExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, const WCHAR* pszSrc, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr = S_OK; @@ -4086,7 +3778,6 @@ STRSAFEAPI StringCatExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, con return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCatNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, size_t cchMaxAppend) { @@ -4106,7 +3797,6 @@ STRSAFEAPI StringCatNWorkerA(char* pszDest, size_t cchDest, const char* pszSrc, return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCatNWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc, size_t cchMaxAppend) { HRESULT hr; @@ -4124,7 +3814,6 @@ STRSAFEAPI StringCatNWorkerW(WCHAR* pszDest, size_t cchDest, const WCHAR* pszSrc return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringCatNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, const char* pszSrc, size_t cchMaxAppend, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { @@ -4272,7 +3961,6 @@ STRSAFEAPI StringCatNExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, con return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringCatNExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, const WCHAR* pszSrc, size_t cchMaxAppend, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) { HRESULT hr = S_OK; @@ -4419,7 +4107,6 @@ STRSAFEAPI StringCatNExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, co return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX STRSAFEAPI StringLengthWorkerA(const char* psz, size_t cchMax, size_t* pcch) { @@ -4446,7 +4133,6 @@ STRSAFEAPI StringLengthWorkerA(const char* psz, size_t cchMax, size_t* pcch) return hr; } -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) STRSAFEAPI StringLengthWorkerW(const WCHAR* psz, size_t cchMax, size_t* pcch) { HRESULT hr = S_OK; @@ -4471,285 +4157,6 @@ STRSAFEAPI StringLengthWorkerW(const WCHAR* psz, size_t cchMax, size_t* pcch) return hr; } -#endif // FEATURE_PAL || !PLATFORM_UNIX #endif // STRSAFE_INLINE -#ifndef STRSAFE_LIB_IMPL -#ifndef FEATURE_PAL -STRSAFE_INLINE_API StringGetsExWorkerA(char* pszDest, size_t cchDest, size_t cbDest, char** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) -{ - HRESULT hr = S_OK; - char* pszDestEnd = pszDest; - size_t cchRemaining = 0; - - // ASSERT(cbDest == (cchDest * sizeof(char)) || - // cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char))); - - // only accept valid flags - if (dwFlags & (~STRSAFE_VALID_FLAGS)) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - if (dwFlags & STRSAFE_IGNORE_NULLS) - { - if (pszDest == NULL) - { - if ((cchDest != 0) || (cbDest != 0)) - { - // NULL pszDest and non-zero cchDest/cbDest is invalid - hr = STRSAFE_E_INVALID_PARAMETER; - } - } - } - - if (SUCCEEDED(hr)) - { - if (cchDest <= 1) - { - pszDestEnd = pszDest; - cchRemaining = cchDest; - - if (cchDest == 1) - { - *pszDestEnd = '\0'; - } - - hr = STRSAFE_E_INSUFFICIENT_BUFFER; - } - else - { - char ch; - - pszDestEnd = pszDest; - cchRemaining = cchDest; - - while ((cchRemaining > 1) && (ch = (char)getc(stdin)) != '\n') - { - if (ch == EOF) - { - if (pszDestEnd == pszDest) - { - // we failed to read anything from stdin - hr = STRSAFE_E_END_OF_FILE; - } - break; - } - - *pszDestEnd = ch; - - pszDestEnd++; - cchRemaining--; - } - - if (cchRemaining > 0) - { - // there is extra room - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); - } - } - - *pszDestEnd = '\0'; - } - } - } - - if (FAILED(hr)) - { - if (pszDest) - { - if (dwFlags & STRSAFE_FILL_ON_FAILURE) - { - memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); - - if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) - { - pszDestEnd = pszDest; - cchRemaining = cchDest; - } - else if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - - // null terminate the end of the string - *pszDestEnd = '\0'; - } - } - - if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) - { - if (cchDest > 0) - { - pszDestEnd = pszDest; - cchRemaining = cchDest; - - // null terminate the beginning of the string - *pszDestEnd = '\0'; - } - } - } - } - - if (SUCCEEDED(hr) || - (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || - (hr == STRSAFE_E_END_OF_FILE)) - { - if (ppszDestEnd) - { - *ppszDestEnd = pszDestEnd; - } - - if (pcchRemaining) - { - *pcchRemaining = cchRemaining; - } - } - - return hr; -} - -#if defined(FEATURE_PAL) || !defined(PLATFORM_UNIX) -STRSAFE_INLINE_API StringGetsExWorkerW(WCHAR* pszDest, size_t cchDest, size_t cbDest, WCHAR** ppszDestEnd, size_t* pcchRemaining, unsigned long dwFlags) -{ - HRESULT hr = S_OK; - WCHAR* pszDestEnd = pszDest; - size_t cchRemaining = 0; - - // ASSERT(cbDest == (cchDest * sizeof(char)) || - // cbDest == (cchDest * sizeof(char)) + (cbDest % sizeof(char))); - - // only accept valid flags - if (dwFlags & (~STRSAFE_VALID_FLAGS)) - { - hr = STRSAFE_E_INVALID_PARAMETER; - } - else - { - if (dwFlags & STRSAFE_IGNORE_NULLS) - { - if (pszDest == NULL) - { - if ((cchDest != 0) || (cbDest != 0)) - { - // NULL pszDest and non-zero cchDest/cbDest is invalid - hr = STRSAFE_E_INVALID_PARAMETER; - } - } - } - - if (SUCCEEDED(hr)) - { - if (cchDest <= 1) - { - pszDestEnd = pszDest; - cchRemaining = cchDest; - - if (cchDest == 1) - { - *pszDestEnd = L'\0'; - } - - hr = STRSAFE_E_INSUFFICIENT_BUFFER; - } - else - { - WCHAR ch; - - pszDestEnd = pszDest; - cchRemaining = cchDest; - - while ((cchRemaining > 1) && (ch = (WCHAR)getwc(stdin)) != L'\n') - { - if (ch == EOF) - { - if (pszDestEnd == pszDest) - { - // we failed to read anything from stdin - hr = STRSAFE_E_END_OF_FILE; - } - break; - } - - *pszDestEnd = ch; - - pszDestEnd++; - cchRemaining--; - } - - if (cchRemaining > 0) - { - // there is extra room - if (dwFlags & STRSAFE_FILL_BEHIND_NULL) - { - memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(WCHAR)) + (cbDest % sizeof(WCHAR))); - } - } - - *pszDestEnd = L'\0'; - } - } - } - - if (FAILED(hr)) - { - if (pszDest) - { - if (dwFlags & STRSAFE_FILL_ON_FAILURE) - { - memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); - - if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) - { - pszDestEnd = pszDest; - cchRemaining = cchDest; - } - else if (cchDest > 0) - { - pszDestEnd = pszDest + cchDest - 1; - cchRemaining = 1; - - // null terminate the end of the string - *pszDestEnd = L'\0'; - } - } - - if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) - { - if (cchDest > 0) - { - pszDestEnd = pszDest; - cchRemaining = cchDest; - - // null terminate the beginning of the string - *pszDestEnd = L'\0'; - } - } - } - } - - if (SUCCEEDED(hr) || - (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || - (hr == STRSAFE_E_END_OF_FILE)) - { - if (ppszDestEnd) - { - *ppszDestEnd = pszDestEnd; - } - - if (pcchRemaining) - { - *pcchRemaining = cchRemaining; - } - } - - return hr; -} -#endif // FEATURE_PAL || !PLATFORM_UNIX -#endif // !FEATURE_PAL -#endif // !STRSAFE_LIB_IMPL - #endif // _STRSAFE_H_INCLUDED_ diff --git a/src/pal/inc/unixasmmacrosarm64.inc b/src/pal/inc/unixasmmacrosarm64.inc index 60142053b0..359f27f878 100644 --- a/src/pal/inc/unixasmmacrosarm64.inc +++ b/src/pal/inc/unixasmmacrosarm64.inc @@ -37,7 +37,8 @@ C_FUNC(\Name\()_End): .endm .macro PREPARE_EXTERNAL_VAR Name, HelperReg - ldr \HelperReg, [pc, #C_FUNC(\Name)@GOTPCREL] + adrp \HelperReg, \Name + add \HelperReg, \HelperReg, :lo12:\Name .endm .macro PROLOG_STACK_ALLOC Size diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index 28ee83a77c..16c9d8bd6f 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -23,20 +23,37 @@ include_directories(include) # Compile options -if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64) - set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1) - add_definitions(-D_AMD64_) -elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) - set(PAL_CMAKE_PLATFORM_ARCH_ARM 1) - add_definitions(-D_ARM_) -elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) - set(PAL_CMAKE_PLATFORM_ARCH_ARM64 1) - add_definitions(-D_ARM64_) -elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) - set(CLR_CMAKE_PLATFORM_ARCH_I386 1) - add_definitions(-D_X86_) +if(CLR_CROSS_COMPONENTS_BUILD) + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) + if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm") + set(PAL_CMAKE_PLATFORM_ARCH_I386 1) + add_definitions(-D_X86_) + else() + set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1) + add_definitions(-D_AMD64_) + endif() + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL i686) + set(PAL_CMAKE_PLATFORM_ARCH_I386 1) + add_definitions(-D_X86_) + else() + message(FATAL_ERROR "Only AMD64, I386 host for cross-architecture component is supported") + endif() else() - message(FATAL_ERROR "Only ARM and AMD64 is supported") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64) + set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1) + add_definitions(-D_AMD64_) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) + set(PAL_CMAKE_PLATFORM_ARCH_ARM 1) + add_definitions(-D_ARM_) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) + set(PAL_CMAKE_PLATFORM_ARCH_ARM64 1) + add_definitions(-D_ARM64_) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) + set(PAL_CMAKE_PLATFORM_ARCH_I386 1) + add_definitions(-D_X86_) + else() + message(FATAL_ERROR "Only ARM, AMD64, ARM64 and I386 is supported") + endif() endif() if(CMAKE_SYSTEM_NAME STREQUAL Darwin) @@ -65,7 +82,7 @@ elseif(PAL_CMAKE_PLATFORM_ARCH_ARM) elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-DBIT64=1) add_definitions(-D_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(PAL_CMAKE_PLATFORM_ARCH_I386) add_definitions(-DBIT32=1) endif() @@ -105,7 +122,7 @@ elseif(PAL_CMAKE_PLATFORM_ARCH_ARM64) arch/arm64/exceptionhelper.S arch/arm64/processor.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(PAL_CMAKE_PLATFORM_ARCH_I386) set(ARCH_SOURCES arch/i386/context2.S arch/i386/debugbreak.S @@ -264,31 +281,73 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) find_library(UNWIND_ARCH NAMES unwind-arm) endif() + if(PAL_CMAKE_PLATFORM_ARCH_ARM64) + find_library(UNWIND_ARCH NAMES unwind-aarch64) + endif() + if(PAL_CMAKE_PLATFORM_ARCH_AMD64) find_library(UNWIND_ARCH NAMES unwind-x86_64) endif() - if(CLR_CMAKE_PLATFORM_ALPINE_LINUX) + if(CLR_CMAKE_PLATFORM_ALPINE_LINUX OR CLR_CMAKE_PLATFORM_ANDROID) find_library(INTL intl) endif() - find_library(UNWIND NAMES unwind) + # On Android, we don't need to link with gcc_s, pthread and rt + if(NOT CLR_CMAKE_PLATFORM_ANDROID) + target_link_libraries(coreclrpal + gcc_s + pthread + rt + ) + endif() + + if(CLR_CMAKE_PLATFORM_ANDROID) + target_link_libraries(coreclrpal + gnustl_shared + android-support + android-glob) + endif() + + if(NOT CLR_CMAKE_PLATFORM_ANDROID) + find_library(UNWIND NAMES unwind) + + if(UNWIND STREQUAL UNWIND-NOTFOUND) + message(FATAL_ERROR "Cannot find libunwind. Try installing libunwind8-dev and libunwind8.") + endif(UNWIND STREQUAL UNWIND-NOTFOUND) + + target_link_libraries(coreclrpal ${UNWIND}) + endif() + + if(CLR_MAKE_PLATFORM_ANDROID) + find_library(ANDROID_SUPPORT NAMES android-support) + find_library(ANDROID_GLOB NAMES android-glob) + find_library(INTL NAMES intl) + + if(UNWIND_ARCH STREQUAL UNWIND_ARCH-NOTFOUND) + message(FATAL_ERROR "Cannot find libunwind.") + endif() + + if(ANDROID_SUPPORT STREQUAL ANDROID_SUPPORT-NOTFOUND) + message(FATAL_ERROR "Cannot find android-support.") + endif() + + if(ANDROID_GLOB STREQUAL ANDROID_GLOB-NOTFOUND) + message(FATAL_ERROR "Cannot find android-glob.") + endif() + + if(INTL STREQUAL INTL-NOTFOUND) + message(FATAL_ERROR "Cannot find libintl.") + endif() + endif() + find_library(UNWIND_GENERIC NAMES unwind-generic) target_link_libraries(coreclrpal - gcc_s - pthread - rt dl uuid ) - if(UNWIND STREQUAL UNWIND-NOTFOUND) - message(FATAL_ERROR "Cannot find libunwind. Try installing libunwind8-dev and libunwind8.") - endif(UNWIND STREQUAL UNWIND-NOTFOUND) - - target_link_libraries(coreclrpal ${UNWIND}) - if(NOT UNWIND_GENERIC STREQUAL UNWIND_GENERIC-NOTFOUND) target_link_libraries(coreclrpal ${UNWIND_GENERIC}) endif(NOT UNWIND_GENERIC STREQUAL UNWIND_GENERIC-NOTFOUND) diff --git a/src/pal/src/arch/amd64/processor.cpp b/src/pal/src/arch/amd64/processor.cpp index ac3d448a81..298d685c98 100644 --- a/src/pal/src/arch/amd64/processor.cpp +++ b/src/pal/src/arch/amd64/processor.cpp @@ -54,10 +54,18 @@ Return value: extern "C" unsigned int XmmYmmStateSupport() { unsigned int eax; - __asm(" xgetbv\n" \ - : "=a"(eax) /*output in eax*/\ - : "c"(0) /*inputs - 0 in ecx*/\ - : "eax", "edx" /* registers that are clobbered*/ + __asm(" mov $1, %%eax\n" \ + " cpuid\n" \ + " xor %%eax, %%eax\n" \ + " and $0x18000000, %%ecx\n" /* check for xsave feature set and that it is enabled by the OS */ \ + " cmp $0x18000000, %%ecx\n" \ + " jne end\n" \ + " xor %%ecx, %%ecx\n" \ + " xgetbv\n" \ + "end:\n" \ + : "=a"(eax) /* output in eax */ \ + : /* no inputs */ \ + : "eax", "ebx", "ecx", "edx" /* registers that are clobbered */ ); // Check OS has enabled both XMM and YMM state support return ((eax & 0x06) == 0x06) ? 1 : 0; diff --git a/src/pal/src/arch/i386/context2.S b/src/pal/src/arch/i386/context2.S index 16cbcc855c..11aba5e647 100644 --- a/src/pal/src/arch/i386/context2.S +++ b/src/pal/src/arch/i386/context2.S @@ -113,39 +113,22 @@ LOCAL_LABEL(Done_Restore_CONTEXT_FLOATING_POINT): movdqu xmm7, [eax + CONTEXT_Xmm7] LOCAL_LABEL(Done_Restore_CONTEXT_EXTENDED_REGISTERS): - // Restore CONTROL register(s) - mov ecx, [eax + CONTEXT_Eip] - mov [esp], ecx - - mov ecx, [eax + CONTEXT_Esp] - push ecx - mov ecx, [eax + CONTEXT_Ebp] - push ecx - - pop ebp - pop esp - - // Restore INTEGER register(s) - mov ecx, [eax + CONTEXT_Edi] - push ecx - mov ecx, [eax + CONTEXT_Esi] - push ecx - mov ecx, [eax + CONTEXT_Edx] - push ecx - mov ecx, [eax + CONTEXT_Ecx] - push ecx - mov ecx, [eax + CONTEXT_Ebx] - push ecx - mov ecx, [eax + CONTEXT_Eax] - push ecx + // Restore Stack + mov esp, [eax + CONTEXT_Esp] - pop eax - pop ebx - pop ecx - pop edx - pop esi - pop edi + // Create a minimal frame + push DWORD PTR [eax + CONTEXT_Eip] + + // Restore register(s) + mov ebp, [eax + CONTEXT_Ebp] + mov edi, [eax + CONTEXT_Edi] + mov esi, [eax + CONTEXT_Esi] + mov edx, [eax + CONTEXT_Edx] + mov ecx, [eax + CONTEXT_Ecx] + mov ebx, [eax + CONTEXT_Ebx] + mov eax, [eax + CONTEXT_Eax] - ret 8 + // Resume + ret LEAF_END RtlRestoreContext, _TEXT diff --git a/src/pal/src/config.h.in b/src/pal/src/config.h.in index 4d21fb70e4..77d7bfaf5a 100644 --- a/src/pal/src/config.h.in +++ b/src/pal/src/config.h.in @@ -51,6 +51,7 @@ #cmakedefine01 HAVE_MACH_EXCEPTIONS #cmakedefine01 HAVE_VM_ALLOCATE #cmakedefine01 HAVE_VM_READ +#cmakedefine01 HAVE_SEMAPHORE_H #cmakedefine01 HAS_SYSV_SEMAPHORES #cmakedefine01 HAS_PTHREAD_MUTEXES #cmakedefine01 HAVE_TTRACE diff --git a/src/pal/src/configure.cmake b/src/pal/src/configure.cmake index a53e0db51e..4f2bc5739b 100644 --- a/src/pal/src/configure.cmake +++ b/src/pal/src/configure.cmake @@ -33,6 +33,7 @@ check_include_files(sys/lwp.h HAVE_SYS_LWP_H) check_include_files(lwp.h HAVE_LWP_H) check_include_files(libunwind.h HAVE_LIBUNWIND_H) check_include_files(runetype.h HAVE_RUNETYPE_H) +check_include_files(semaphore.h HAVE_SEMAPHORE_H) if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) set(CMAKE_REQUIRED_FLAGS "-ldl") @@ -48,15 +49,26 @@ check_include_files(gnu/lib-names.h HAVE_GNU_LIBNAMES_H) check_function_exists(kqueue HAVE_KQUEUE) check_function_exists(getpwuid_r HAVE_GETPWUID_R) -check_library_exists(pthread pthread_suspend "" HAVE_PTHREAD_SUSPEND) -check_library_exists(pthread pthread_suspend_np "" HAVE_PTHREAD_SUSPEND_NP) -check_library_exists(pthread pthread_continue "" HAVE_PTHREAD_CONTINUE) -check_library_exists(pthread pthread_continue_np "" HAVE_PTHREAD_CONTINUE_NP) -check_library_exists(pthread pthread_resume_np "" HAVE_PTHREAD_RESUME_NP) -check_library_exists(pthread pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP) -check_library_exists(pthread pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP) -check_library_exists(pthread pthread_getcpuclockid "" HAVE_PTHREAD_GETCPUCLOCKID) -check_library_exists(pthread pthread_sigqueue "" HAVE_PTHREAD_SIGQUEUE) + +check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD) +check_library_exists(c pthread_create "" HAVE_PTHREAD_IN_LIBC) + +if (HAVE_LIBPTHREAD) + set(PTHREAD_LIBRARY pthread) +elseif (HAVE_PTHREAD_IN_LIBC) + set(PTHREAD_LIBRARY c) +endif() + +check_library_exists(${PTHREAD_LIBRARY} pthread_suspend "" HAVE_PTHREAD_SUSPEND) +check_library_exists(${PTHREAD_LIBRARY} pthread_suspend_np "" HAVE_PTHREAD_SUSPEND_NP) +check_library_exists(${PTHREAD_LIBRARY} pthread_continue "" HAVE_PTHREAD_CONTINUE) +check_library_exists(${PTHREAD_LIBRARY} pthread_continue_np "" HAVE_PTHREAD_CONTINUE_NP) +check_library_exists(${PTHREAD_LIBRARY} pthread_resume_np "" HAVE_PTHREAD_RESUME_NP) +check_library_exists(${PTHREAD_LIBRARY} pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP) +check_library_exists(${PTHREAD_LIBRARY} pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP) +check_library_exists(${PTHREAD_LIBRARY} pthread_getcpuclockid "" HAVE_PTHREAD_GETCPUCLOCKID) +check_library_exists(${PTHREAD_LIBRARY} pthread_sigqueue "" HAVE_PTHREAD_SIGQUEUE) + check_function_exists(sigreturn HAVE_SIGRETURN) check_function_exists(_thread_sys_sigreturn HAVE__THREAD_SYS_SIGRETURN) set(CMAKE_REQUIRED_LIBRARIES m) @@ -874,7 +886,8 @@ int main(void) unlink(szFileName); exit(ret); }" UNGETC_NOT_RETURN_EOF) -set(CMAKE_REQUIRED_LIBRARIES pthread) + +set(CMAKE_REQUIRED_LIBRARIES ${PTHREAD_LIBRARY}) check_cxx_source_runs(" #include #include diff --git a/src/pal/src/cruntime/file.cpp b/src/pal/src/cruntime/file.cpp index 5fe2b671f3..0eb2cea151 100644 --- a/src/pal/src/cruntime/file.cpp +++ b/src/pal/src/cruntime/file.cpp @@ -194,45 +194,6 @@ static BOOL WriteOnlyMode(FILE* pFile) } #endif //UNGETC_NOT_RETURN_EOF -/*++ -Function: - _getw - -Gets an integer from a stream. - -Return Value - -_getw returns the integer value read. A return value of EOF indicates -either an error or end of file. However, because the EOF value is also -a legitimate integer value, use feof or ferror to verify an -end-of-file or error condition. - -Parameter - -file Pointer to FILE structure - ---*/ -int -__cdecl -_getw(PAL_FILE *f) -{ - INT ret = 0; - - PERF_ENTRY(_getw); - ENTRY("_getw (f=%p)\n", f); - - _ASSERTE(f != NULL); - - CLEARERR(f); - - ret = getw( f->bsdFilePtr ); - LOGEXIT( "returning %d\n", ret ); - PERF_EXIT(_getw); - - return ret; -} - - /*++ Function: _fdopen @@ -447,45 +408,6 @@ _wfsopen( return NULL; } -/*++ -Function: - _putw - -Writes an integer to a stream. - -Return Value - -_putw returns the value written. A return value of EOF may indicate an -error. Because EOF is also a legitimate integer value, use ferror to -verify an error. - -Parameters - -c Binary integer to be output -file Pointer to FILE structure - ---*/ -int -__cdecl -_putw(int c, PAL_FILE *f) -{ - INT ret = 0; - - PERF_ENTRY(_putw); - ENTRY("_putw (c=0x%x, f=%p)\n", c, f); - - _ASSERTE(f != NULL); - - CLEARERR(f); - - ret = putw(c, f->bsdFilePtr ); - LOGEXIT( "returning %d\n", ret ); - PERF_EXIT(_putw); - - return ret; -} - - /*++ Function PAL_get_stdout. diff --git a/src/pal/src/cruntime/math.cpp b/src/pal/src/cruntime/math.cpp index 08f4192998..d53dbe7982 100644 --- a/src/pal/src/cruntime/math.cpp +++ b/src/pal/src/cruntime/math.cpp @@ -66,11 +66,7 @@ int __cdecl _finite(double x) PERF_ENTRY(_finite); ENTRY("_finite (x=%f)\n", x); -#if defined(_IA64_) && defined (_HPUX_) - ret = !isnan(x) && (x != PAL_POSINF_DBL) && (x != PAL_NEGINF_DBL); -#else ret = isfinite(x); -#endif LOGEXIT("_finite returns int %d\n", ret); PERF_EXIT(_finite); @@ -452,11 +448,7 @@ int __cdecl _finitef(float x) PERF_ENTRY(_finitef); ENTRY("_finitef (x=%f)\n", x); -#if defined(_IA64_) && defined (_HPUX_) - ret = !isnan(x) && (x != PAL_POSINF_FLT) && (x != PAL_NEGINF_FLT); -#else ret = isfinite(x); -#endif LOGEXIT("_finitef returns int %d\n", ret); PERF_EXIT(_finitef); diff --git a/src/pal/src/cruntime/printf.cpp b/src/pal/src/cruntime/printf.cpp index c437b8e39f..72c7e11bea 100644 --- a/src/pal/src/cruntime/printf.cpp +++ b/src/pal/src/cruntime/printf.cpp @@ -1363,34 +1363,6 @@ int PAL_wvsscanf(LPCWSTR Buffer, LPCWSTR Format, va_list ap) return Length; } -/*++ -Function: - PAL_swprintf - -See MSDN doc. ---*/ -int -__cdecl -PAL_swprintf( - wchar_16 *buffer, - const wchar_16 *format, - ...) -{ - LONG Length; - va_list ap; - - PERF_ENTRY(swprintf); - ENTRY("PAL_swprintf (buffer=%p, format=%p (%S))\n", buffer, format, format); - - va_start(ap, format); - Length = PAL__wvsnprintf(buffer, 0x7fffffff, format, ap); - va_end(ap); - - LOGEXIT("PAL_swprintf returns int %d\n", Length); - PERF_EXIT(swprintf); - return Length; -} - /*++ Function: PAL_swscanf @@ -1420,60 +1392,6 @@ PAL_swscanf( } -/*++ -Function: - PAL_vsprintf - -See MSDN doc. ---*/ -int -__cdecl -PAL_vsprintf(char *buffer, - const char *format, - va_list argptr) -{ - LONG Length; - - PERF_ENTRY(vsprintf); - ENTRY("PAL_vsprintf (buffer=%p, format=%p (%s), argptr=%p)\n", - buffer, format, format, argptr); - - Length = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), buffer, 0x7fffffff, format, argptr); - - LOGEXIT("PAL_vsprintf returns int %d\n", Length); - PERF_EXIT(vsprintf); - - return Length; -} - - -/*++ -Function: - PAL_vswprintf - -See MSDN doc. ---*/ -int -__cdecl -PAL_vswprintf(wchar_16 *buffer, - const wchar_16 *format, - va_list argptr) -{ - LONG Length; - - PERF_ENTRY(vswprintf); - ENTRY("PAL_vswprintf (buffer=%p, format=%p (%S), argptr=%p)\n", - buffer, format, format, argptr); - - Length = PAL__wvsnprintf(buffer, 0x7fffffff, format, argptr); - - LOGEXIT("PAL_vswprintf returns int %d\n", Length); - PERF_EXIT(vswprintf); - - return Length; -} - - #if SSCANF_CANNOT_HANDLE_MISSING_EXPONENT /*++ Function: diff --git a/src/pal/src/cruntime/printfcpp.cpp b/src/pal/src/cruntime/printfcpp.cpp index ea074a604b..0b9072102b 100644 --- a/src/pal/src/cruntime/printfcpp.cpp +++ b/src/pal/src/cruntime/printfcpp.cpp @@ -35,8 +35,9 @@ SET_DEFAULT_DEBUG_CHANNEL(CRT); using namespace CorUnix; -int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR Format, va_list ap); -int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Format, va_list ap); +static const char __nullstring[] = "(null)"; /* string to print on null ptr */ +static const WCHAR __wnullstring[] = W("(null)"); /* string to print on null ptr */ + int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format, va_list ap); int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *format, va_list ap); @@ -865,7 +866,7 @@ Parameters: - padding style flags (PRINTF_FORMAT_FLAGS) *******************************************************************************/ -INT Internal_AddPaddingVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, LPSTR In, +INT Internal_AddPaddingVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, LPCSTR In, INT Padding, INT Flags) { LPSTR Out; @@ -1051,49 +1052,6 @@ static INT Internal_AddPaddingVfwprintf(CPalThread *pthrCurrent, PAL_FILE *strea return Written; } -/******************************************************************************* -Function: - PAL_vsnprintf - -Parameters: - Buffer - - out buffer - Count - - buffer size - Format - - format string - ap - - stdarg parameter list -*******************************************************************************/ - -int __cdecl PAL__vsnprintf(LPSTR Buffer, size_t Count, LPCSTR Format, va_list ap) -{ - LONG Length; - - PERF_ENTRY(PAL__vsnprintf); - ENTRY("PAL__vsnprintf (buffer=%p, count=%d, format=%p (%s), argptr=%p)\n", - Buffer, Count, Format, Format, ap); - - Length = CoreVsnprintf(InternalGetCurrentThread(), Buffer, Count, Format, ap); - - LOGEXIT("PAL__vsnprintf returns int %d\n", Length); - PERF_EXIT(PAL__vsnprintf); - - return Length; -} - -/******************************************************************************* -Function: - PAL_wvsnprintf - - -- see PAL_vsnprintf above -*******************************************************************************/ - -int __cdecl PAL__wvsnprintf(LPWSTR Buffer, size_t Count, LPCWSTR Format, va_list ap) -{ - return CoreWvsnprintf(InternalGetCurrentThread(), Buffer, Count, Format, ap); -} - /******************************************************************************* Function: PAL_vfprintf @@ -1132,31 +1090,17 @@ int __cdecl PAL_vfwprintf(PAL_FILE *stream, const wchar_16 *format, va_list ap) } // end extern "C" -int CorUnix::InternalWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR Format, va_list ap) -{ - return CoreWvsnprintf(pthrCurrent, Buffer, Count, Format, ap); -} - -int CorUnix::InternalVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Format, va_list ap) -{ - return CoreVsnprintf(pthrCurrent, Buffer, Count, Format, ap); -} - int CorUnix::InternalVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format, va_list ap) { return CoreVfprintf(pthrCurrent, stream, format, ap); } -int CorUnix::InternalVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *format, va_list ap) -{ - return CoreVfwprintf(pthrCurrent, stream, format, ap); -} - int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *format, va_list aparg) { CHAR TempBuff[1024]; /* used to hold a single % format string */ LPCWSTR Fmt = format; - LPWSTR TempWStr = NULL; + LPCWSTR TempWStr = NULL; + LPWSTR AllocedTempWStr = NULL; LPWSTR WorkingWStr = NULL; WCHAR TempWChar[2]; INT Flags; @@ -1165,7 +1109,6 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for INT Prefix; INT Type; INT TempInt; - BOOL WStrWasMalloced = FALSE; int mbtowcResult; int written=0; int paddingReturnValue; @@ -1193,7 +1136,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for (Type == PFF_TYPE_STRING || Type == PFF_TYPE_WSTRING)) || (Type == PFF_TYPE_WSTRING && (Flags & PFF_ZERO) != 0)) { - WStrWasMalloced = FALSE; + AllocedTempWStr = NULL; if (WIDTH_STAR == Width) { @@ -1222,37 +1165,50 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for else { /* %lS assumes a LPSTR argument. */ - LPSTR s = va_arg(ap, LPSTR ); - UINT Length = 0; - Length = MultiByteToWideChar( CP_ACP, 0, s, -1, NULL, 0 ); - if ( Length != 0 ) + LPCSTR s = va_arg(ap, LPSTR ); + if (s == NULL) { - TempWStr = - (LPWSTR)InternalMalloc( (Length) * sizeof( WCHAR ) ); - if ( TempWStr ) + TempWStr = NULL; + } + else + { + UINT Length = 0; + Length = MultiByteToWideChar( CP_ACP, 0, s, -1, NULL, 0 ); + if ( Length != 0 ) { - WStrWasMalloced = TRUE; - MultiByteToWideChar( CP_ACP, 0, s, -1, - TempWStr, Length ); + AllocedTempWStr = + (LPWSTR)InternalMalloc( (Length) * sizeof( WCHAR ) ); + + if ( AllocedTempWStr ) + { + MultiByteToWideChar( CP_ACP, 0, s, -1, + AllocedTempWStr, Length ); + TempWStr = AllocedTempWStr; + } + else + { + ERROR( "InternalMalloc failed.\n" ); + LOGEXIT("vfwprintf returns int -1\n"); + PERF_EXIT(vfwprintf); + va_end(ap); + return -1; + } } else { - ERROR( "InternalMalloc failed.\n" ); + ASSERT( "Unable to convert from multibyte " + " to wide char.\n" ); LOGEXIT("vfwprintf returns int -1\n"); PERF_EXIT(vfwprintf); va_end(ap); return -1; } } - else - { - ASSERT( "Unable to convert from multibyte " - " to wide char.\n" ); - LOGEXIT("vfwprintf returns int -1\n"); - PERF_EXIT(vfwprintf); - va_end(ap); - return -1; - } + } + + if (TempWStr == NULL) + { + TempWStr = __wnullstring; } INT Length = PAL_wcslen(TempWStr); @@ -1263,10 +1219,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for LOGEXIT("vfwprintf returns int -1\n"); PERF_EXIT(vfwprintf); pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY); - if (WStrWasMalloced) - { - free(TempWStr); - } + free(AllocedTempWStr); va_end(ap); return -1; } @@ -1281,10 +1234,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for if (wcsncpy_s(WorkingWStr, (Length + 1), TempWStr, Precision+1) != SAFECRT_SUCCESS) { ERROR("Internal_AddPaddingVfwprintf failed\n"); - if (WStrWasMalloced) - { - free(TempWStr); - } + free(AllocedTempWStr); free(WorkingWStr); LOGEXIT("wcsncpy_s failed!\n"); PERF_EXIT(vfwprintf); @@ -1310,10 +1260,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for if (paddingReturnValue == -1) { ERROR("Internal_AddPaddingVfwprintf failed\n"); - if (WStrWasMalloced) - { - free(TempWStr); - } + free(AllocedTempWStr); free(WorkingWStr); LOGEXIT("vfwprintf returns int -1\n"); PERF_EXIT(vfwprintf); @@ -1323,10 +1270,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for written += paddingReturnValue; free(WorkingWStr); - if (WStrWasMalloced) - { - free(TempWStr); - } + free(AllocedTempWStr); } else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR) { @@ -1466,7 +1410,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for va_list apcopy; va_copy(apcopy, ap); - TempInt = vsnprintf(TempSprintfStr, TEMP_COUNT, TempBuff, apcopy); + TempInt = _vsnprintf_s(TempSprintfStr, TEMP_COUNT, _TRUNCATE, TempBuff, apcopy); va_end(apcopy); PAL_printf_arg_remover(&ap, Width, Precision, Type, Prefix); @@ -1484,7 +1428,7 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for TempSprintfStr = TempSprintfStrPtr; va_copy(apcopy, ap); - vsnprintf(TempSprintfStr, TempInt, TempBuff, apcopy); + _vsnprintf_s(TempSprintfStr, TempInt, _TRUNCATE, TempBuff, apcopy); va_end(apcopy); PAL_printf_arg_remover(&ap, Width, Precision, Type, Prefix); } @@ -1581,13 +1525,11 @@ int CoreVfwprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const wchar_16 *for return (written); } -int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Format, va_list aparg) +int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format, va_list aparg) { - BOOL BufferRanOut = FALSE; CHAR TempBuff[1024]; /* used to hold a single % format string */ - LPSTR BufferPtr = Buffer; - LPCSTR Fmt = Format; - LPWSTR TempWStr; + LPCSTR Fmt = format; + LPCWSTR TempWStr; LPSTR TempStr; WCHAR TempWChar; INT Flags; @@ -1598,21 +1540,20 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo INT Length; INT TempInt; int wctombResult; + int written = 0; + int paddingReturnValue; va_list ap; + PERF_ENTRY(vfprintf); + va_copy(ap, aparg); - + while (*Fmt) { - if (BufferRanOut || (BufferPtr - Buffer) >= static_cast(Count)) //Count is assumed to be in the range of int - { - BufferRanOut = TRUE; - break; - } - else if(*Fmt == '%' && - TRUE == Internal_ExtractFormatA(pthrCurrent, &Fmt, TempBuff, &Flags, - &Width, &Precision, - &Prefix, &Type)) + if (*Fmt == '%' && + TRUE == Internal_ExtractFormatA(pthrCurrent, &Fmt, TempBuff, &Flags, + &Width, &Precision, + &Prefix, &Type)) { if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_STRING) { @@ -1637,20 +1578,26 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo } TempWStr = va_arg(ap, LPWSTR); + if (TempWStr == NULL)\ + { + TempWStr = __wnullstring; + } Length = WideCharToMultiByte(CP_ACP, 0, TempWStr, -1, 0, 0, 0, 0); if (!Length) - { + { ASSERT("WideCharToMultiByte failed. Error is %d\n", - GetLastError()); + GetLastError()); + PERF_EXIT(vfprintf); va_end(ap); return -1; } TempStr = (LPSTR) InternalMalloc(Length); if (!TempStr) - { + { ERROR("InternalMalloc failed\n"); pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY); + PERF_EXIT(vfprintf); va_end(ap); return -1; } @@ -1670,6 +1617,7 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo ASSERT("WideCharToMultiByte failed. Error is %d\n", GetLastError()); free(TempStr); + PERF_EXIT(vfprintf); va_end(ap); return -1; } @@ -1682,10 +1630,11 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo wctombResult = WideCharToMultiByte(CP_ACP, 0, TempWStr, -1, TempStr, Length, 0, 0); if (!wctombResult) - { + { ASSERT("WideCharToMultiByte failed. Error is %d\n", GetLastError()); free(TempStr); + PERF_EXIT(vfprintf); va_end(ap); return -1; } @@ -1693,18 +1642,24 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo } /* do the padding (if needed)*/ - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - TempStr, - Width - Length, - Flags); + paddingReturnValue = + Internal_AddPaddingVfprintf(pthrCurrent, stream, TempStr, + Width - Length, Flags); + if (-1 == paddingReturnValue) + { + ERROR("Internal_AddPaddingVfprintf failed\n"); + free(TempStr); + PERF_EXIT(vfprintf); + va_end(ap); + return -1; + } + written += paddingReturnValue; free(TempStr); } else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR) { CHAR TempBuffer[5]; - if (WIDTH_STAR == Width || WIDTH_INVALID == Width) { @@ -1717,26 +1672,33 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo /* ignore (because it's a char), and remove arg */ TempInt = va_arg(ap, INT); /* value not used */ } - + TempWChar = va_arg(ap, int); Length = WideCharToMultiByte(CP_ACP, 0, &TempWChar, 1, TempBuffer, sizeof(TempBuffer), 0, 0); if (!Length) - { + { ASSERT("WideCharToMultiByte failed. Error is %d\n", GetLastError()); + PERF_EXIT(vfprintf); va_end(ap); return -1; } TempBuffer[Length] = 0; /* do the padding (if needed)*/ - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - TempBuffer, - Width - Length, - Flags); + paddingReturnValue = + Internal_AddPaddingVfprintf(pthrCurrent, stream, TempBuffer, + Width - Length, Flags); + if (-1 == paddingReturnValue) + { + ERROR("Internal_AddPaddingVfprintf failed\n"); + PERF_EXIT(vfprintf); + va_end(ap); + return -1; + } + written += paddingReturnValue; } /* this places the number of bytes written to the buffer in the @@ -1754,716 +1716,48 @@ int CoreVsnprintf(CPalThread *pthrCurrent, LPSTR Buffer, size_t Count, LPCSTR Fo if (Prefix == PFF_PREFIX_SHORT) { - *(va_arg(ap, short *)) = BufferPtr - Buffer; + *(va_arg(ap, short *)) = written; } else { - *(va_arg(ap, LPLONG)) = BufferPtr - Buffer; + *(va_arg(ap, LPLONG)) = written; } } else if (Type == PFF_TYPE_CHAR && (Flags & PFF_ZERO) != 0) { - // Some versions of sprintf don't support 0-padded chars, + // Some versions of fprintf don't support 0-padded chars, // so we handle them here. char ch[2]; ch[0] = (char) va_arg(ap, int); ch[1] = '\0'; Length = 1; - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - ch, - Width - Length, - Flags); + paddingReturnValue = Internal_AddPaddingVfprintf( + pthrCurrent, + stream, + ch, + Width - Length, + Flags); + if (-1 == paddingReturnValue) + { + ERROR("Internal_AddPaddingVfprintf failed\n"); + PERF_EXIT(vfprintf); + va_end(ap); + return -1; + } + written += paddingReturnValue; } else if (Type == PFF_TYPE_STRING && (Flags & PFF_ZERO) != 0) { - // Some versions of sprintf don't support 0-padded strings, + // Some versions of fprintf don't support 0-padded strings, // so we handle them here. - char *tempStr; + const char *tempStr; tempStr = va_arg(ap, char *); - Length = strlen(tempStr); - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - tempStr, - Width - Length, - Flags); - } - else - { - // Types that sprintf can handle - size_t TempCount = Count - (BufferPtr - Buffer); - -#if !HAVE_LARGE_SNPRINTF_SUPPORT - // Limit TempCount to 0x40000000, which is sufficient - // for platforms on which snprintf fails for very large - // sizes. - if (TempCount > 0x40000000) - { - TempCount = 0x40000000; - } -#endif // HAVE_LARGE_SNPRINTF_SUPPORT - - TempInt = 0; - // %h (short) doesn't seem to be handled properly by local sprintf, - // so we do the truncation ourselves for some cases. - if (Type == PFF_TYPE_P && Prefix == PFF_PREFIX_SHORT) - { - // Convert from pointer -> int -> short to avoid warnings. - long trunc1; - short trunc2; - - trunc1 = va_arg(ap, LONG); - trunc2 = (short) trunc1; - trunc1 = trunc2; - - TempInt = snprintf(BufferPtr, TempCount, TempBuff, trunc1); - } - else if (Type == PFF_TYPE_INT && Prefix == PFF_PREFIX_SHORT) - { - // Convert explicitly from int to short to get - // correct sign extension for shorts on all systems. - int n; - short s; - - n = va_arg(ap, int); - s = (short) n; - - TempInt = snprintf(BufferPtr, TempCount, TempBuff, s); - } - else - { - va_list apcopy; - va_copy(apcopy, ap); - TempInt = vsnprintf(BufferPtr, TempCount, TempBuff, apcopy); - va_end(apcopy); - PAL_printf_arg_remover(&ap, Width, Precision, Type, Prefix); - } - - if (TempInt < 0 || static_cast(TempInt) >= TempCount) /* buffer not long enough */ - { - BufferPtr += TempCount; - BufferRanOut = TRUE; - } - else - { - BufferPtr += TempInt; - } - } - } - else - { - *BufferPtr++ = *Fmt++; /* copy regular chars into buffer */ - } - } - - if (static_cast(Count) > (BufferPtr - Buffer)) //Count is assumed to be in the range of int - { - *BufferPtr = 0; /* end the string */ - } - - va_end(ap); - - if (BufferRanOut) - { - errno = ERANGE; - return -1; - } - else - { - return BufferPtr - Buffer; - } -} - -int CoreWvsnprintf(CPalThread *pthrCurrent, LPWSTR Buffer, size_t Count, LPCWSTR Format, va_list aparg) -{ - BOOL BufferRanOut = FALSE; - CHAR TempBuff[1024]; /* used to hold a single % format string */ - LPWSTR BufferPtr = Buffer; - LPCWSTR Fmt = Format; - LPWSTR TempWStr = NULL; - LPWSTR WorkingWStr = NULL; - WCHAR TempWChar[2]; - INT Flags; - INT Width; - INT Precision; - INT Prefix; - INT Type; - INT TempInt; - LPSTR TempNumberBuffer; - int mbtowcResult; - va_list(ap); - - PERF_ENTRY(wvsnprintf); - ENTRY("wvsnprintf (buffer=%p, count=%u, format=%p (%S))\n", - Buffer, Count, Format, Format); - - va_copy(ap, aparg); - - while (*Fmt) - { - if (BufferRanOut || (BufferPtr - Buffer) >= static_cast(Count)) //Count is assumed to be in the range of int - { - BufferRanOut = TRUE; - break; - } - else if(*Fmt == '%' && - TRUE == Internal_ExtractFormatW(pthrCurrent, &Fmt, TempBuff, &Flags, - &Width, &Precision, - &Prefix, &Type)) - { - if (((Prefix == PFF_PREFIX_LONG || Prefix == PFF_PREFIX_LONG_W) && - (Type == PFF_TYPE_STRING || Type == PFF_TYPE_WSTRING)) || - (Prefix == PFF_PREFIX_SHORT && Type == PFF_TYPE_STRING) || - (Type == PFF_TYPE_WSTRING && (Flags & PFF_ZERO) != 0)) - { - BOOL needToFree = FALSE; - - if (WIDTH_STAR == Width) - { - Width = va_arg(ap, INT); - } - else if (WIDTH_INVALID == Width) - { - /* both a '*' and a number, ignore, but remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - if (PRECISION_STAR == Precision) - { - Precision = va_arg(ap, INT); - } - else if (PRECISION_INVALID == Precision) - { - /* both a '*' and a number, ignore, but remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - if ((Type == PFF_TYPE_STRING && Prefix == PFF_PREFIX_LONG) || - Prefix == PFF_PREFIX_LONG_W) - { - TempWStr = va_arg(ap, LPWSTR); - } - else + if (tempStr == NULL) { - // %lS and %hs assume an LPSTR argument. - LPSTR s = va_arg(ap, LPSTR ); - UINT Length = 0; - Length = MultiByteToWideChar( CP_ACP, 0, s, -1, NULL, 0 ); - if ( Length != 0 ) - { - TempWStr = - (LPWSTR)InternalMalloc((Length + 1 ) * sizeof( WCHAR ) ); - if ( TempWStr ) - { - needToFree = TRUE; - MultiByteToWideChar( CP_ACP, 0, s, -1, - TempWStr, Length ); - } - else - { - ERROR( "InternalMalloc failed.\n" ); - va_end(ap); - return -1; - } - } - else - { - ASSERT( "Unable to convert from multibyte " - " to wide char.\n" ); - va_end(ap); - return -1; - } - + tempStr = __nullstring; } - - INT Length = PAL_wcslen(TempWStr); - WorkingWStr = (LPWSTR) InternalMalloc(sizeof(WCHAR) * (Length + 1)); - if (!WorkingWStr) - { - ERROR("InternalMalloc failed\n"); - pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY); - if (needToFree) - { - free(TempWStr); - } - va_end(ap); - return -1; - } - if (PRECISION_DOT == Precision) - { - // Copy nothing - *WorkingWStr = 0; - Length = 0; - } - else if (Precision > 0 && Precision < Length) - { - if (wcsncpy_s(WorkingWStr, (Length + 1), TempWStr, Precision+1) != SAFECRT_SUCCESS) - { - ERROR("CoreWvsnprintf failed\n"); - if (needToFree) - { - free(TempWStr); - } - free(WorkingWStr); - LOGEXIT("wcsncpy_s failed!\n"); - PERF_EXIT(wvsnprintf); - va_end(ap); - return (-1); - } - - Length = Precision; - } - else - { - // Copy everything - PAL_wcscpy(WorkingWStr, TempWStr); - } - - // Add padding if needed. - BufferRanOut = !Internal_AddPaddingW(&BufferPtr, - Count - (BufferPtr - Buffer), - WorkingWStr, - Width - Length, - Flags); - - if (needToFree) - { - free(TempWStr); - } - free(WorkingWStr); - } - else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR) - { - if (WIDTH_STAR == Width || - WIDTH_INVALID == Width) - { - /* ignore (because it's a char), and remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - if (PRECISION_STAR == Precision || - PRECISION_INVALID == Precision) - { - /* ignore (because it's a char), and remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - TempWChar[0] = va_arg(ap, int); - TempWChar[1] = 0; - - /* do the padding (if needed)*/ - BufferRanOut = !Internal_AddPaddingW(&BufferPtr, - Count - (BufferPtr - Buffer), - TempWChar, - Width - 1, - Flags); - - } - /* this places the number of bytes written to the buffer in the - next arg */ - else if (Type == PFF_TYPE_N) - { - if (WIDTH_STAR == Width) - { - Width = va_arg(ap, INT); - } - if (PRECISION_STAR == Precision) - { - Precision = va_arg(ap, INT); - } - - if (Prefix == PFF_PREFIX_SHORT) - { - *(va_arg(ap, short *)) = BufferPtr - Buffer; - } - else - { - *(va_arg(ap, LPLONG)) = BufferPtr - Buffer; - } - } - else - { - // Types that sprintf can handle - - /* note: I'm using the wide buffer as a (char *) buffer when I - pass it to sprintf(). After I get the buffer back I make a - backup of the chars copied and then convert them to wide - and place them in the buffer (BufferPtr) */ - size_t TempCount = Count - (BufferPtr - Buffer); - TempInt = 0; - -#if !HAVE_LARGE_SNPRINTF_SUPPORT - // Limit TempCount to 0x40000000, which is sufficient - // for platforms on which snprintf fails for very large - // sizes. - if (TempCount > 0x40000000) - { - TempCount = 0x40000000; - } -#endif // HAVE_LARGE_SNPRINTF_SUPPORT - - // %h (short) doesn't seem to be handled properly by local sprintf, - // so we do the truncation ourselves for some cases. - if (Type == PFF_TYPE_P && Prefix == PFF_PREFIX_SHORT) - { - // Convert from pointer -> int -> short to avoid warnings. - long trunc1; - short trunc2; - - trunc1 = va_arg(ap, LONG); - trunc2 = (short)trunc1; - trunc1 = trunc2; - - TempInt = snprintf((LPSTR)BufferPtr, TempCount, TempBuff, trunc1); - } - else if (Type == PFF_TYPE_INT && Prefix == PFF_PREFIX_SHORT) - { - // Convert explicitly from int to short to get - // correct sign extension for shorts on all systems. - int n; - short s; - - n = va_arg(ap, int); - s = (short) n; - - TempInt = snprintf((LPSTR)BufferPtr, TempCount, TempBuff, s); - } - else - { - va_list apcopy; - va_copy(apcopy, ap); - TempInt = vsnprintf((LPSTR) BufferPtr, TempCount, TempBuff, apcopy); - va_end(apcopy); - PAL_printf_arg_remover(&ap, Width, Precision, Type, Prefix); - } - - if (TempInt == 0) - { - // The argument is "". - continue; - } - if (TempInt < 0 || static_cast(TempInt) >= TempCount) /* buffer not long enough */ - { - TempNumberBuffer = (LPSTR) InternalMalloc(TempCount+1); - if (!TempNumberBuffer) - { - ERROR("InternalMalloc failed\n"); - pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY); - errno = ENOMEM; - va_end(ap); - return -1; - } - - if (strncpy_s(TempNumberBuffer, TempCount+1, (LPSTR) BufferPtr, TempCount) != SAFECRT_SUCCESS) - { - ASSERT("strncpy_s failed!\n"); - free(TempNumberBuffer); - va_end(ap); - return -1; - } - - mbtowcResult = MultiByteToWideChar(CP_ACP, 0, - TempNumberBuffer, - TempCount, - BufferPtr, TempCount); - if (!mbtowcResult) - { - ASSERT("MultiByteToWideChar failed. Error is %d\n", - GetLastError()); - free(TempNumberBuffer); - va_end(ap); - return -1; - } - BufferPtr += TempCount; - BufferRanOut = TRUE; - } - else - { - TempNumberBuffer = (LPSTR) InternalMalloc(TempInt+1); - if (!TempNumberBuffer) - { - ERROR("InternalMalloc failed\n"); - pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY); - va_end(ap); - return -1; - } - - if (strncpy_s(TempNumberBuffer, TempInt+1, (LPSTR) BufferPtr, TempInt) != SAFECRT_SUCCESS) - { - ASSERT("strncpy_s failed!\n"); - free(TempNumberBuffer); - va_end(ap); - return -1; - } - - mbtowcResult = MultiByteToWideChar(CP_ACP, 0, - TempNumberBuffer, - TempInt, - BufferPtr, TempInt); - if (!mbtowcResult) - { - ASSERT("MultiByteToWideChar failed. Error is %d\n", - GetLastError()); - free(TempNumberBuffer); - va_end(ap); - return -1; - } - BufferPtr += TempInt; - } - free(TempNumberBuffer); - } - } - else - { - *BufferPtr++ = *Fmt++; /* copy regular chars into buffer */ - } - } - - if (static_cast(Count) > (BufferPtr - Buffer)) //Count is assumed to be in the range of int - { - *BufferPtr = 0; /* end the string */ - } - - va_end(ap); - - if (BufferRanOut) - { - errno = ERANGE; - return -1; - } - else - { - return BufferPtr - Buffer; - } -} - -int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format, va_list aparg) -{ - CHAR TempBuff[1024]; /* used to hold a single % format string */ - LPCSTR Fmt = format; - LPWSTR TempWStr; - LPSTR TempStr; - WCHAR TempWChar; - INT Flags; - INT Width; - INT Precision; - INT Prefix; - INT Type; - INT Length; - INT TempInt; - int wctombResult; - int written = 0; - int paddingReturnValue; - va_list ap; - - PERF_ENTRY(vfprintf); - - va_copy(ap, aparg); - - while (*Fmt) - { - if (*Fmt == '%' && - TRUE == Internal_ExtractFormatA(pthrCurrent, &Fmt, TempBuff, &Flags, - &Width, &Precision, - &Prefix, &Type)) - { - if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_STRING) - { - if (WIDTH_STAR == Width) - { - Width = va_arg(ap, INT); - } - else if (WIDTH_INVALID == Width) - { - /* both a '*' and a number, ignore, but remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - if (PRECISION_STAR == Precision) - { - Precision = va_arg(ap, INT); - } - else if (PRECISION_INVALID == Precision) - { - /* both a '*' and a number, ignore, but remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - TempWStr = va_arg(ap, LPWSTR); - Length = WideCharToMultiByte(CP_ACP, 0, TempWStr, -1, 0, - 0, 0, 0); - if (!Length) - { - ASSERT("WideCharToMultiByte failed. Error is %d\n", - GetLastError()); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - TempStr = (LPSTR) InternalMalloc(Length); - if (!TempStr) - { - ERROR("InternalMalloc failed\n"); - pthrCurrent->SetLastError(ERROR_NOT_ENOUGH_MEMORY); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - if (PRECISION_DOT == Precision) - { - /* copy nothing */ - *TempStr = 0; - Length = 0; - } - else if (Precision > 0 && Precision < Length - 1) - { - Length = WideCharToMultiByte(CP_ACP, 0, TempWStr, - Precision, TempStr, Length, - 0, 0); - if (!Length) - { - ASSERT("WideCharToMultiByte failed. Error is %d\n", - GetLastError()); - free(TempStr); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - TempStr[Length] = 0; - Length = Precision; - } - /* copy everything */ - else - { - wctombResult = WideCharToMultiByte(CP_ACP, 0, TempWStr, -1, - TempStr, Length, 0, 0); - if (!wctombResult) - { - ASSERT("WideCharToMultiByte failed. Error is %d\n", - GetLastError()); - free(TempStr); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - --Length; /* exclude null char */ - } - - /* do the padding (if needed)*/ - paddingReturnValue = - Internal_AddPaddingVfprintf(pthrCurrent, stream, TempStr, - Width - Length, Flags); - if (-1 == paddingReturnValue) - { - ERROR("Internal_AddPaddingVfprintf failed\n"); - free(TempStr); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - written += paddingReturnValue; - - free(TempStr); - } - else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR) - { - CHAR TempBuffer[5]; - if (WIDTH_STAR == Width || - WIDTH_INVALID == Width) - { - /* ignore (because it's a char), and remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - if (PRECISION_STAR == Precision || - PRECISION_INVALID == Precision) - { - /* ignore (because it's a char), and remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - TempWChar = va_arg(ap, int); - Length = WideCharToMultiByte(CP_ACP, 0, &TempWChar, 1, - TempBuffer, sizeof(TempBuffer), - 0, 0); - if (!Length) - { - ASSERT("WideCharToMultiByte failed. Error is %d\n", - GetLastError()); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - TempBuffer[Length] = 0; - - /* do the padding (if needed)*/ - paddingReturnValue = - Internal_AddPaddingVfprintf(pthrCurrent, stream, TempBuffer, - Width - Length, Flags); - if (-1 == paddingReturnValue) - { - ERROR("Internal_AddPaddingVfprintf failed\n"); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - written += paddingReturnValue; - - } - /* this places the number of bytes written to the buffer in the - next arg */ - else if (Type == PFF_TYPE_N) - { - if (WIDTH_STAR == Width) - { - Width = va_arg(ap, INT); - } - if (PRECISION_STAR == Precision) - { - Precision = va_arg(ap, INT); - } - - if (Prefix == PFF_PREFIX_SHORT) - { - *(va_arg(ap, short *)) = written; - } - else - { - *(va_arg(ap, LPLONG)) = written; - } - } - else if (Type == PFF_TYPE_CHAR && (Flags & PFF_ZERO) != 0) - { - // Some versions of fprintf don't support 0-padded chars, - // so we handle them here. - char ch[2]; - - ch[0] = (char) va_arg(ap, int); - ch[1] = '\0'; - Length = 1; - paddingReturnValue = Internal_AddPaddingVfprintf( - pthrCurrent, - stream, - ch, - Width - Length, - Flags); - if (-1 == paddingReturnValue) - { - ERROR("Internal_AddPaddingVfprintf failed\n"); - PERF_EXIT(vfprintf); - va_end(ap); - return -1; - } - written += paddingReturnValue; - } - else if (Type == PFF_TYPE_STRING && (Flags & PFF_ZERO) != 0) - { - // Some versions of fprintf don't support 0-padded strings, - // so we handle them here. - char *tempStr; - - tempStr = va_arg(ap, char *); Length = strlen(tempStr); paddingReturnValue = Internal_AddPaddingVfprintf( pthrCurrent, diff --git a/src/pal/src/cruntime/silent_printf.cpp b/src/pal/src/cruntime/silent_printf.cpp index 1d10963973..4047c7e199 100644 --- a/src/pal/src/cruntime/silent_printf.cpp +++ b/src/pal/src/cruntime/silent_printf.cpp @@ -40,286 +40,6 @@ static INT Silent_AddPaddingVfprintf(PAL_FILE *stream, LPSTR In, INT Padding, static size_t Silent_PAL_wcslen(const wchar_16 *string); -/******************************************************************************* -Function: - PAL_vsnprintf (silent version) - for more details, see PAL_vsnprintf in printf.c -*******************************************************************************/ -INT Silent_PAL_vsnprintf(LPSTR Buffer, INT Count, LPCSTR Format, va_list aparg) -{ - BOOL BufferRanOut = FALSE; - CHAR TempBuff[1024]; /* used to hold a single % format string */ - LPSTR BufferPtr = Buffer; - LPCSTR Fmt = Format; - LPWSTR TempWStr; - CHAR TempStr[MAX_STR_LEN+1]; - WCHAR TempWChar; - INT Flags; - INT Width; - INT Precision; - INT Prefix; - INT Type; - INT Length; - INT TempInt; - int wctombResult; - va_list ap; - - va_copy(ap, aparg); - - while (*Fmt) - { - if ((BufferPtr - Buffer) >= Count) - { - BufferRanOut = TRUE; - break; - } - else if(*Fmt == '%' && - TRUE == Silent_ExtractFormatA(&Fmt, TempBuff, &Flags, - &Width, &Precision, - &Prefix, &Type)) - { - if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_STRING) - { - if (WIDTH_STAR == Width) - { - Width = va_arg(ap, INT); - } - else if (WIDTH_INVALID == Width) - { - /* both a '*' and a number, ignore, but remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - if (PRECISION_STAR == Precision) - { - Precision = va_arg(ap, INT); - } - else if (PRECISION_INVALID == Precision) - { - /* both a '*' and a number, ignore, but remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - TempWStr = va_arg(ap, LPWSTR); - Length = Silent_WideCharToMultiByte(TempWStr, -1, 0, 0); - if (!Length) - { - va_end(ap); - return -1; - } - - /* clip string output to MAX_STR_LEN characters */ - if (PRECISION_DOT == Precision) - { - Precision = MAX_STR_LEN; - } - - if (PRECISION_DOT == Precision) - { - /* copy nothing */ - *TempStr = 0; - Length = 0; - } - else if (Precision > 0 && Precision < Length - 1) - { - Length = Silent_WideCharToMultiByte(TempWStr, Precision, - TempStr, Length); - if (!Length) - { - va_end(ap); - return -1; - } - TempStr[Length] = 0; - Length = Precision; - } - /* copy everything */ - else - { - wctombResult = Silent_WideCharToMultiByte(TempWStr, -1, - TempStr, Length); - if (!wctombResult) - { - PAL_free(TempStr); - va_end(ap); - return -1; - } - --Length; /* exclude null char */ - } - - /* do the padding (if needed)*/ - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - TempStr, - Width - Length, - Flags); - } - else if (Prefix == PFF_PREFIX_LONG && Type == PFF_TYPE_CHAR) - { - CHAR TempBuffer[4]; - - if (WIDTH_STAR == Width || - WIDTH_INVALID == Width) - { - /* ignore (because it's a char), and remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - if (PRECISION_STAR == Precision || - PRECISION_INVALID == Precision) - { - /* ignore (because it's a char), and remove arg */ - TempInt = va_arg(ap, INT); /* value not used */ - } - - TempWChar = va_arg(ap, int); - Length = Silent_WideCharToMultiByte(&TempWChar, 1, TempBuffer, 4); - if (!Length) - { - va_end(ap); - return -1; - } - TempBuffer[Length] = 0; - - /* do the padding (if needed)*/ - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - TempBuffer, - Width - Length, - Flags); - - } - /* this places the number of bytes written to the buffer in the - next arg */ - else if (Type == PFF_TYPE_N) - { - if (WIDTH_STAR == Width) - { - Width = va_arg(ap, INT); - } - if (PRECISION_STAR == Precision) - { - Precision = va_arg(ap, INT); - } - if (Prefix == PFF_PREFIX_SHORT) - { - *(va_arg(ap, short *)) = BufferPtr - Buffer; - } - else - { - *(va_arg(ap, LPLONG)) = BufferPtr - Buffer; - } - } - else if (Type == PFF_TYPE_CHAR && (Flags & PFF_ZERO) != 0) - { - // Some versions of sprintf don't support 0-padded chars, - // so we handle them here. - char ch[2]; - - ch[0] = (char) va_arg(ap, int); - ch[1] = '\0'; - Length = 1; - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - ch, - Width - Length, - Flags); - } - else if (Type == PFF_TYPE_STRING && (Flags & PFF_ZERO) != 0) - { - // Some versions of sprintf don't support 0-padded strings, - // so we handle them here. - char *tempStr; - - tempStr = va_arg(ap, char *); - Length = strlen(tempStr); - BufferRanOut = !Internal_AddPaddingA(&BufferPtr, - Count - (BufferPtr - Buffer), - tempStr, - Width - Length, - Flags); - } - /* types that sprintf can handle */ - else - { - size_t TempCount = Count - (BufferPtr - Buffer); - - TempInt = 0; - /* %h (short) doesn't seem to be handled properly by local sprintf, - so lets do the truncation ourselves. (ptr -> int -> short to avoid - warnings */ - if (Type == PFF_TYPE_P && Prefix == PFF_PREFIX_SHORT) - { - long trunc1; - short trunc2; - - trunc1 = va_arg(ap, LONG); - trunc2 = (short)trunc1; - - TempInt = snprintf(BufferPtr, TempCount, TempBuff, trunc2); - } - else if (Type == PFF_TYPE_INT && Prefix == PFF_PREFIX_SHORT) - { - // Convert explicitly from int to short to get - // correct sign extension for shorts on all systems. - int n; - short s; - - n = va_arg(ap, int); - s = (short) n; - - TempInt = snprintf(BufferPtr, TempCount, TempBuff, s); - } - else - { - /* limit string output (%s) to 300 characters */ - if(TempBuff[0] == '%' && TempBuff[1] == 's') - { - if (strcpy_s(TempBuff, sizeof(TempBuff), "%.300s") != SAFECRT_SUCCESS) - { - va_end(ap); - return -1; - } - } - va_list apcopy; - va_copy(apcopy, ap); - TempInt = InternalVsnprintf(CorUnix::InternalGetCurrentThread(), BufferPtr, TempCount, TempBuff, apcopy); - va_end(apcopy); - PAL_printf_arg_remover(&ap, Width, Precision, Type, Prefix); - } - - if (TempInt < 0 || static_cast(TempInt) >= TempCount) /* buffer not long enough */ - { - BufferPtr += TempCount; - BufferRanOut = TRUE; - } - else - { - BufferPtr += TempInt; - } - } - } - else - { - *BufferPtr++ = *Fmt++; /* copy regular chars into buffer */ - } - } - - if (Count > (BufferPtr - Buffer)) - { - *BufferPtr = 0; /* end the string */ - } - - va_end(ap); - - if (BufferRanOut) - { - return -1; - } - else - { - return BufferPtr - Buffer; - } -} - /*++ Function: PAL_vfprintf (silent version) diff --git a/src/pal/src/cruntime/string.cpp b/src/pal/src/cruntime/string.cpp index abe6d136f0..2abce6fd8f 100644 --- a/src/pal/src/cruntime/string.cpp +++ b/src/pal/src/cruntime/string.cpp @@ -278,7 +278,7 @@ PAL_atol(const char *szNumber) PERF_ENTRY(atol); ENTRY("atol (szNumber=%p (%s))\n", - szNumber?szNumber:"NULL" + szNumber, szNumber?szNumber:"NULL" ); lResult = atol(szNumber); diff --git a/src/pal/src/debug/debug.cpp b/src/pal/src/debug/debug.cpp index 2f7d17cabe..2eaaec9f1f 100644 --- a/src/pal/src/debug/debug.cpp +++ b/src/pal/src/debug/debug.cpp @@ -543,254 +543,6 @@ SetThreadContext( return ret; } -/*++ -Function: - PAL_CreateExecWatchpoint - -Abstract - Creates an OS exec watchpoint for the specified instruction - and thread. This function should only be called on architectures - that do not support a hardware single-step mode (e.g., SPARC). - -Parameter - hThread : the thread for which the watchpoint is to apply - pvInstruction : the instruction on which the watchpoint is to be set - -Return - A Win32 error code ---*/ - -DWORD -PAL_CreateExecWatchpoint( - HANDLE hThread, - PVOID pvInstruction - ) -{ - PERF_ENTRY(PAL_CreateExecWatchpoint); - ENTRY("PAL_CreateExecWatchpoint (hThread=%p, pvInstruction=%p)\n", hThread, pvInstruction); - - DWORD dwError = ERROR_NOT_SUPPORTED; - -#if HAVE_PRWATCH_T - - CPalThread *pThread = NULL; - CPalThread *pTargetThread = NULL; - IPalObject *pobjThread = NULL; - int fd = -1; - char ctlPath[50]; - - struct - { - long ctlCode; - prwatch_t prwatch; - } ctlStruct; - - // - // We must never set a watchpoint on an instruction that enters a syscall; - // if such a request comes in we succeed it w/o actually creating the - // watchpoint. This mirrors the behavior of setting the single-step flag - // in a thread context when the thread is w/in a system service -- the - // flag is ignored and will not be present when the thread returns - // to user mode. - // - -#if defined(_SPARC_) - if (*(DWORD*)pvInstruction == 0x91d02008) // ta 8 - { - TRACE("Watchpoint requested on sysenter instruction -- ignoring"); - dwError = ERROR_SUCCESS; - goto PAL_CreateExecWatchpointExit; - } -#else -#error Need syscall instruction for this platform -#endif // _SPARC_ - - pThread = InternalGetCurrentThread(); - - dwError = InternalGetThreadDataFromHandle( - pThread, - hThread, - 0, // THREAD_SET_CONTEXT - &pTargetThread, - &pobjThread - ); - - if (NO_ERROR != dwError) - { - goto PAL_CreateExecWatchpointExit; - } - - snprintf(ctlPath, sizeof(ctlPath), "/proc/%u/lwp/%u/lwpctl", getpid(), pTargetThread->GetLwpId()); - - fd = InternalOpen(pThread, ctlPath, O_WRONLY); - if (-1 == fd) - { - ERROR("Failed to open %s\n", ctlPath); - dwError = ERROR_INVALID_ACCESS; - goto PAL_CreateExecWatchpointExit; - } - - ctlStruct.ctlCode = PCWATCH; - ctlStruct.prwatch.pr_vaddr = (uintptr_t) pvInstruction; - ctlStruct.prwatch.pr_size = sizeof(DWORD); - ctlStruct.prwatch.pr_wflags = WA_EXEC | WA_TRAPAFTER; - - if (write(fd, (void*) &ctlStruct, sizeof(ctlStruct)) != sizeof(ctlStruct)) - { - ERROR("Failure writing control structure (errno = %u)\n", errno); - dwError = ERROR_INTERNAL_ERROR; - goto PAL_CreateExecWatchpointExit; - } - - dwError = ERROR_SUCCESS; - -PAL_CreateExecWatchpointExit: - - if (NULL != pobjThread) - { - pobjThread->ReleaseReference(pThread); - } - - if (-1 != fd) - { - close(fd); - } - -#endif // HAVE_PRWATCH_T - - LOGEXIT("PAL_CreateExecWatchpoint returns ret:%d\n", dwError); - PERF_EXIT(PAL_CreateExecWatchpoint); - return dwError; -} - -/*++ -Function: - PAL_DeleteExecWatchpoint - -Abstract - Deletes an OS exec watchpoint for the specified instruction - and thread. This function should only be called on architectures - that do not support a hardware single-step mode (e.g., SPARC). - -Parameter - hThread : the thread to remove the watchpoint from - pvInstruction : the instruction for which the watchpoint is to be removed - -Return - A Win32 error code. Attempting to delete a watchpoint that does not exist - may or may not result in an error, depending on the behavior of the - underlying operating system. ---*/ - -DWORD -PAL_DeleteExecWatchpoint( - HANDLE hThread, - PVOID pvInstruction - ) -{ - PERF_ENTRY(PAL_DeleteExecWatchpoint); - ENTRY("PAL_DeleteExecWatchpoint (hThread=%p, pvInstruction=%p)\n", hThread, pvInstruction); - - DWORD dwError = ERROR_NOT_SUPPORTED; - -#if HAVE_PRWATCH_T - - CPalThread *pThread = NULL; - CPalThread *pTargetThread = NULL; - IPalObject *pobjThread = NULL; - int fd = -1; - char ctlPath[50]; - - struct - { - long ctlCode; - prwatch_t prwatch; - } ctlStruct; - - - pThread = InternalGetCurrentThread(); - - dwError = InternalGetThreadDataFromHandle( - pThread, - hThread, - 0, // THREAD_SET_CONTEXT - &pTargetThread, - &pobjThread - ); - - if (NO_ERROR != dwError) - { - goto PAL_DeleteExecWatchpointExit; - } - - snprintf(ctlPath, sizeof(ctlPath), "/proc/%u/lwp/%u/lwpctl", getpid(), pTargetThread->GetLwpId()); - - fd = InternalOpen(pThread, ctlPath, O_WRONLY); - if (-1 == fd) - { - ERROR("Failed to open %s\n", ctlPath); - dwError = ERROR_INVALID_ACCESS; - goto PAL_DeleteExecWatchpointExit; - } - - ctlStruct.ctlCode = PCWATCH; - ctlStruct.prwatch.pr_vaddr = (uintptr_t) pvInstruction; - ctlStruct.prwatch.pr_size = sizeof(DWORD); - ctlStruct.prwatch.pr_wflags = 0; - - if (write(fd, (void*) &ctlStruct, sizeof(ctlStruct)) != sizeof(ctlStruct)) - { - ERROR("Failure writing control structure (errno = %u)\n", errno); - dwError = ERROR_INTERNAL_ERROR; - goto PAL_DeleteExecWatchpointExit; - } - - dwError = ERROR_SUCCESS; - -PAL_DeleteExecWatchpointExit: - - if (NULL != pobjThread) - { - pobjThread->ReleaseReference(pThread); - } - - if (-1 != fd) - { - close(fd); - } - -#endif // HAVE_PRWATCH_T - - LOGEXIT("PAL_DeleteExecWatchpoint returns ret:%d\n", dwError); - PERF_EXIT(PAL_DeleteExecWatchpoint); - return dwError; -} - -__attribute__((noinline)) -__attribute__((optnone)) -void -ProbeMemory(volatile PBYTE pbBuffer, DWORD cbBuffer, bool fWriteAccess) -{ - // Need an throw in this function to fool the C++ runtime into handling the - // possible h/w exception below. - if (pbBuffer == NULL) - { - throw PAL_SEHException(); - } - - // Simple one byte at a time probing - while (cbBuffer > 0) - { - volatile BYTE read = *pbBuffer; - if (fWriteAccess) - { - *pbBuffer = read; - } - ++pbBuffer; - --cbBuffer; - } -} - /*++ Function: PAL_ProbeMemory @@ -812,18 +564,58 @@ PAL_ProbeMemory( DWORD cbBuffer, BOOL fWriteAccess) { - try - { - // Need to explicit h/w exception holder so to catch them in ProbeMemory - CatchHardwareExceptionHolder __catchHardwareException; + int fds[2]; - ProbeMemory((PBYTE)pBuffer, cbBuffer, fWriteAccess); - } - catch(...) + if (pipe(fds) != 0) { + ASSERT("pipe failed: errno is %d (%s)\n", errno, strerror(errno)); return FALSE; } - return TRUE; + + fcntl(fds[0], O_NONBLOCK); + fcntl(fds[1], O_NONBLOCK); + + PVOID pEnd = (PBYTE)pBuffer + cbBuffer; + BOOL result = TRUE; + + // Validate the first byte in the buffer, then validate the first byte on each page after that. + while (pBuffer < pEnd) + { + int written = write(fds[1], pBuffer, 1); + if (written == -1) + { + if (errno != EFAULT) + { + ASSERT("write failed: errno is %d (%s)\n", errno, strerror(errno)); + } + result = FALSE; + break; + } + else + { + if (fWriteAccess) + { + int rd = read(fds[0], pBuffer, 1); + if (rd == -1) + { + if (errno != EFAULT) + { + ASSERT("read failed: errno is %d (%s)\n", errno, strerror(errno)); + } + result = FALSE; + break; + } + } + } + + // Round to the beginning of the next page + pBuffer = (PVOID)(((SIZE_T)pBuffer & ~VIRTUAL_PAGE_MASK) + VIRTUAL_PAGE_SIZE); + } + + close(fds[0]); + close(fds[1]); + + return result; } } // extern "C" diff --git a/src/pal/src/exception/machexception.h b/src/pal/src/exception/machexception.h index 18e31501b2..e2f8ee7a86 100644 --- a/src/pal/src/exception/machexception.h +++ b/src/pal/src/exception/machexception.h @@ -25,8 +25,6 @@ extern "C" { #endif // __cplusplus -#define HIJACK_ON_SIGNAL 1 - // List of exception types we will be watching for // NOTE: if you change any of these, you need to adapt s_nMachExceptionPortsMax in thread.hpp #define PAL_EXC_ILLEGAL_MASK (EXC_MASK_BAD_INSTRUCTION | EXC_MASK_EMULATION) diff --git a/src/pal/src/exception/seh-unwind.cpp b/src/pal/src/exception/seh-unwind.cpp index fa2f109875..e3fa09f7c8 100644 --- a/src/pal/src/exception/seh-unwind.cpp +++ b/src/pal/src/exception/seh-unwind.cpp @@ -322,14 +322,14 @@ BOOL PAL_VirtualUnwind(CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *contextP if (unw_is_signal_frame(&cursor) > 0) { context->ContextFlags |= CONTEXT_EXCEPTION_ACTIVE; -#if defined(_ARM_) || defined(_ARM64_) +#if defined(_ARM_) || defined(_ARM64_) || defined(_X86_) context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; #endif // _ARM_ || _ARM64_ } else { context->ContextFlags &= ~CONTEXT_EXCEPTION_ACTIVE; -#if defined(_ARM_) || defined(_ARM64_) +#if defined(_ARM_) || defined(_ARM64_) || defined(_X86_) context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; #endif // _ARM_ || _ARM64_ } diff --git a/src/pal/src/exception/signal.hpp b/src/pal/src/exception/signal.hpp index c0c950ed4d..cd019e676b 100644 --- a/src/pal/src/exception/signal.hpp +++ b/src/pal/src/exception/signal.hpp @@ -46,13 +46,6 @@ Function : --*/ void SEHCleanupSignals(); -#if (__GNUC__ > 3 || \ - (__GNUC__ == 3 && __GNUC_MINOR__ > 2)) -// For gcc > 3.2, sjlj exceptions semantics are no longer available -// Therefore we need to hijack out of signal handlers before second pass -#define HIJACK_ON_SIGNAL 1 -#endif - #endif // !HAVE_MACH_EXCEPTIONS #endif /* _PAL_SIGNAL_HPP_ */ diff --git a/src/pal/src/file/disk.cpp b/src/pal/src/file/disk.cpp index ef1d488b28..08880c9c20 100644 --- a/src/pal/src/file/disk.cpp +++ b/src/pal/src/file/disk.cpp @@ -26,10 +26,7 @@ Revision History: #include "pal/stackstring.hpp" #include -#if !defined(_AIX) -// do we actually need this on other platforms. We don't seem to be using anything from there #include -#endif #include #if HAVE_STATVFS #include diff --git a/src/pal/src/file/file.cpp b/src/pal/src/file/file.cpp index 6443a5e7b9..d70e62bd52 100644 --- a/src/pal/src/file/file.cpp +++ b/src/pal/src/file/file.cpp @@ -18,6 +18,9 @@ Abstract: --*/ +#include "pal/dbgmsg.h" +SET_DEFAULT_DEBUG_CHANNEL(FILE); // some headers have code with asserts, so do this first + #include "pal/thread.hpp" #include "pal/file.hpp" #include "shmfilelockmgr.hpp" @@ -25,7 +28,6 @@ Abstract: #include "pal/stackstring.hpp" #include "pal/palinternal.h" -#include "pal/dbgmsg.h" #include "pal/file.h" #include "pal/filetime.h" #include "pal/utils.h" @@ -42,8 +44,6 @@ Abstract: using namespace CorUnix; -SET_DEFAULT_DEBUG_CHANNEL(FILE); - int MaxWCharToAcpLengthFactor = 3; PAL_ERROR @@ -3657,12 +3657,9 @@ DWORD FILEGetLastErrorFromErrno( void ) case EEXIST: dwRet = ERROR_ALREADY_EXISTS; break; -#if !defined(_AIX) - // ENOTEMPTY is the same as EEXIST on AIX. Meaningful when involving directory operations case ENOTEMPTY: dwRet = ERROR_DIR_NOT_EMPTY; break; -#endif case EBADF: dwRet = ERROR_INVALID_HANDLE; break; diff --git a/src/pal/src/file/path.cpp b/src/pal/src/file/path.cpp index c4ef31be32..d998b72b2e 100644 --- a/src/pal/src/file/path.cpp +++ b/src/pal/src/file/path.cpp @@ -494,8 +494,8 @@ GetTempPathA( } else /* env var not found or was empty */ { - /* no luck, use /tmp/ */ - const char *defaultDir = "/tmp/"; + /* no luck, use /tmp/ or /data/local/tmp on Android */ + const char *defaultDir = TEMP_DIRECTORY_PATH; int defaultDirLen = strlen(defaultDir); if (defaultDirLen < nBufferLength) { diff --git a/src/pal/src/include/pal/modulename.h b/src/pal/src/include/pal/modulename.h index 70b0a610dc..20001f8797 100644 --- a/src/pal/src/include/pal/modulename.h +++ b/src/pal/src/include/pal/modulename.h @@ -28,9 +28,6 @@ extern "C" #endif // __cplusplus const char *PAL_dladdr(LPVOID ProcAddress); -#if defined(_AIX) -int GetLibRotorNameViaLoadQuery(LPSTR pszBuf); -#endif #ifdef __cplusplus } diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h index f7856be902..48e2f3c683 100644 --- a/src/pal/src/include/pal/palinternal.h +++ b/src/pal/src/include/pal/palinternal.h @@ -335,7 +335,7 @@ function_name() to call the system's implementation #undef va_arg #endif -#if !defined(_MSC_VER) && defined(FEATURE_PAL) && defined(_WIN64) +#if !defined(_MSC_VER) && defined(_WIN64) #undef _BitScanForward64 #endif @@ -358,6 +358,7 @@ function_name() to call the system's implementation #undef memchr #undef strlen #undef strnlen +#undef wcsnlen #undef stricmp #undef strstr #undef strcmp @@ -502,7 +503,6 @@ function_name() to call the system's implementation #undef vfwprintf #undef vprintf #undef wprintf -#undef swprintf #undef wcstod #undef wcstol #undef wcstoul @@ -525,10 +525,6 @@ function_name() to call the system's implementation #undef iswspace #undef towlower #undef towupper -#undef vsprintf -#undef vswprintf -#undef _vsnprintf -#undef vsnprintf #undef wvsnprintf #ifdef _AMD64_ @@ -606,15 +602,19 @@ function_name() to call the system's implementation #define INFTIM -1 #endif // !HAVE_INFTIM -#if (__GNUC__ >= 4) #define OffsetOf(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER) -#else -#define OffsetOf(s, f) (INT)(SIZE_T)&(((s*)0)->f) -#endif /* __GNUC__ version check*/ #undef assert #define assert (Use__ASSERTE_instead_of_assert) assert +#ifndef __ANDROID__ +#define TEMP_DIRECTORY_PATH "/tmp/" +#else +// On Android, "/tmp/" doesn't exist; temporary files should go to +// /data/local/tmp/ +#define TEMP_DIRECTORY_PATH "/data/local/tmp/" +#endif + #define PROCESS_PIPE_NAME_PREFIX ".dotnet-pal-processpipe" #ifdef __cplusplus diff --git a/src/pal/src/include/pal/printfcpp.hpp b/src/pal/src/include/pal/printfcpp.hpp index 0a728c9fd7..12e923a506 100644 --- a/src/pal/src/include/pal/printfcpp.hpp +++ b/src/pal/src/include/pal/printfcpp.hpp @@ -31,22 +31,6 @@ typedef char16_t wchar_16; // __wchar_16_cpp (which is defined in palinternal.h) extern "C" { - int - __cdecl - PAL__vsnprintf( - LPSTR Buffer, - size_t Count, - LPCSTR Format, - va_list ap); - - int - __cdecl - PAL__wvsnprintf( - LPWSTR Buffer, - size_t Count, - LPCWSTR Format, - va_list ap); - int __cdecl PAL_vfprintf( @@ -71,48 +55,9 @@ namespace CorUnix const char *format, va_list ap); - int - InternalWvsnprintf( - CPalThread *pthrCurrent, - LPWSTR Buffer, - size_t Count, - LPCWSTR Format, - va_list ap); - - int - InternalVsnprintf( - CPalThread *pthrCurrent, - LPSTR Buffer, - size_t Count, - LPCSTR Format, - va_list ap); - - int - InternalVfwprintf( - CPalThread *pthrCurrent, - PAL_FILE *stream, - const wchar_16 *format, - va_list ap); - } #else // __cplusplus - int - __cdecl - PAL__vsnprintf( - LPSTR Buffer, - size_t Count, - LPCSTR Format, - va_list ap); - - int - __cdecl - PAL__wvsnprintf( - LPWSTR Buffer, - size_t Count, - LPCWSTR Format, - va_list ap); - int __cdecl PAL_vfprintf( diff --git a/src/pal/src/include/pal/sharedmemory.h b/src/pal/src/include/pal/sharedmemory.h index 45cc4b2c8d..2e0d9d2a79 100644 --- a/src/pal/src/include/pal/sharedmemory.h +++ b/src/pal/src/include/pal/sharedmemory.h @@ -15,30 +15,33 @@ #define _countof(a) (sizeof(a) / sizeof(a[0])) #endif // !_countof +// The temporary folder is used for storing shared memory files and their lock files. +// The location of the temporary folder varies (e.g. /data/local/tmp on Android) +// and is set in TEMP_DIRECTORY_PATH. TEMP_DIRECTORY_PATH ends with '/' // - Global shared memory files go in: -// /tmp/.dotnet/shm/global/ +// {tmp}/.dotnet/shm/global/ // - Session-scoped shared memory files go in: -// /tmp/.dotnet/shm/session/ +// {tmp}/.dotnet/shm/session/ // - Lock files associated with global shared memory files go in: -// /tmp/.dotnet/lockfiles/global/ +// {tmp}/.dotnet/lockfiles/global/ // - Lock files associated with session-scoped shared memory files go in: -// /tmp/.dotnet/lockfiles/session/ +// {tmp}/.dotnet/lockfiles/session/ #define SHARED_MEMORY_MAX_FILE_NAME_CHAR_COUNT (_MAX_FNAME - 1) #define SHARED_MEMORY_MAX_NAME_CHAR_COUNT (_countof("Global\\") - 1 + SHARED_MEMORY_MAX_FILE_NAME_CHAR_COUNT) -#define SHARED_MEMORY_TEMP_DIRECTORY_PATH "/tmp" -#define SHARED_MEMORY_RUNTIME_TEMP_DIRECTORY_PATH "/tmp/.dotnet" +#define SHARED_MEMORY_TEMP_DIRECTORY_PATH TEMP_DIRECTORY_PATH +#define SHARED_MEMORY_RUNTIME_TEMP_DIRECTORY_PATH TEMP_DIRECTORY_PATH ".dotnet" -#define SHARED_MEMORY_SHARED_MEMORY_DIRECTORY_PATH "/tmp/.dotnet/shm" -#define SHARED_MEMORY_LOCK_FILES_DIRECTORY_PATH "/tmp/.dotnet/lockfiles" +#define SHARED_MEMORY_SHARED_MEMORY_DIRECTORY_PATH TEMP_DIRECTORY_PATH ".dotnet/shm" +#define SHARED_MEMORY_LOCK_FILES_DIRECTORY_PATH TEMP_DIRECTORY_PATH ".dotnet/lockfiles" static_assert_no_msg(_countof(SHARED_MEMORY_LOCK_FILES_DIRECTORY_PATH) >= _countof(SHARED_MEMORY_SHARED_MEMORY_DIRECTORY_PATH)); #define SHARED_MEMORY_GLOBAL_DIRECTORY_NAME "global" #define SHARED_MEMORY_SESSION_DIRECTORY_NAME_PREFIX "session" static_assert_no_msg(_countof(SHARED_MEMORY_SESSION_DIRECTORY_NAME_PREFIX) >= _countof(SHARED_MEMORY_GLOBAL_DIRECTORY_NAME)); -#define SHARED_MEMORY_UNIQUE_TEMP_NAME_TEMPLATE "/tmp/.coreclr.XXXXXX" +#define SHARED_MEMORY_UNIQUE_TEMP_NAME_TEMPLATE TEMP_DIRECTORY_PATH ".coreclr.XXXXXX" #define SHARED_MEMORY_MAX_SESSION_ID_CHAR_COUNT (10) diff --git a/src/pal/src/include/pal/thread.hpp b/src/pal/src/include/pal/thread.hpp index e6dacd2136..ddacfb9039 100644 --- a/src/pal/src/include/pal/thread.hpp +++ b/src/pal/src/include/pal/thread.hpp @@ -93,11 +93,6 @@ namespace CorUnix HANDLE *phThread ); - PAL_ERROR - InitializeGlobalThreadData( - void - ); - PAL_ERROR CreateThreadData( CPalThread **ppThread @@ -241,12 +236,6 @@ namespace CorUnix int ); - friend - PAL_ERROR - InitializeGlobalThreadData( - void - ); - friend PAL_ERROR CreateThreadData( @@ -338,13 +327,6 @@ namespace CorUnix // Limit address of the stack of this thread void* m_stackLimit; - // The default stack size of a newly created thread (currently 256KB) - // when the dwStackSize paramter of PAL_CreateThread() - // is zero. This value can be set by setting the - // environment variable PAL_THREAD_DEFAULT_STACK_SIZE - // (the value should be in bytes and in hex). - static DWORD s_dwDefaultThreadStackSize; - // // The thread entry routine (called from InternalCreateThread) // diff --git a/src/pal/src/include/pal/threadsusp.hpp b/src/pal/src/include/pal/threadsusp.hpp index e1e85e265c..dfd65d0f8b 100644 --- a/src/pal/src/include/pal/threadsusp.hpp +++ b/src/pal/src/include/pal/threadsusp.hpp @@ -55,6 +55,8 @@ Abstract: #if HAVE_SYS_SEMAPHORE_H #include +#elif HAVE_SEMAPHORE_H +#include #endif // HAVE_SYS_SEMAPHORE_H #elif HAS_PTHREAD_MUTEXES && HAVE_MACH_EXCEPTIONS diff --git a/src/pal/src/include/pal/utils.h b/src/pal/src/include/pal/utils.h index 3ddad4ae2f..f381d957ab 100644 --- a/src/pal/src/include/pal/utils.h +++ b/src/pal/src/include/pal/utils.h @@ -20,10 +20,66 @@ Abstract: #ifndef _PAL_UTILS_H_ #define _PAL_UTILS_H_ +#include + #include #include #include +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Alignment helpers (copied for PAL use from stdmacros.h) + +inline size_t ALIGN_UP(size_t val, size_t alignment) +{ + // alignment must be a power of 2 for this implementation to work (need modulo otherwise) + _ASSERTE(0 == (alignment & (alignment - 1))); + size_t result = (val + (alignment - 1)) & ~(alignment - 1); + _ASSERTE(result >= val); // check for overflow + return result; +} + +inline void* ALIGN_UP(void* val, size_t alignment) +{ + return (void*)ALIGN_UP((size_t)val, alignment); +} + +inline uint8_t* ALIGN_UP(uint8_t* val, size_t alignment) +{ + return (uint8_t*)ALIGN_UP((size_t)val, alignment); +} + +inline size_t ALIGN_DOWN(size_t val, size_t alignment) +{ + // alignment must be a power of 2 for this implementation to work (need modulo otherwise) + _ASSERTE(0 == (alignment & (alignment - 1))); + size_t result = val & ~(alignment - 1); + return result; +} + +inline void* ALIGN_DOWN(void* val, size_t alignment) +{ + return (void*)ALIGN_DOWN((size_t)val, alignment); +} + +inline uint8_t* ALIGN_DOWN(uint8_t* val, size_t alignment) +{ + return (uint8_t*)ALIGN_DOWN((size_t)val, alignment); +} + +inline BOOL IS_ALIGNED(size_t val, size_t alignment) +{ + // alignment must be a power of 2 for this implementation to work (need modulo otherwise) + _ASSERTE(0 == (alignment & (alignment - 1))); + return 0 == (val & (alignment - 1)); +} + +inline BOOL IS_ALIGNED(const void* val, size_t alignment) +{ + return IS_ALIGNED((size_t)val, alignment); +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + #ifdef __cplusplus extern "C" { diff --git a/src/pal/src/include/pal/virtual.h b/src/pal/src/include/pal/virtual.h index a4e225281e..31d225fc04 100644 --- a/src/pal/src/include/pal/virtual.h +++ b/src/pal/src/include/pal/virtual.h @@ -58,12 +58,7 @@ enum VIRTUAL_CONSTANTS VIRTUAL_EXECUTE, VIRTUAL_EXECUTE_READ, - /* Page manipulation constants. */ -#ifdef __sparc__ - VIRTUAL_PAGE_SIZE = 0x2000, -#else // __sparc__ VIRTUAL_PAGE_SIZE = 0x1000, -#endif // __sparc__ VIRTUAL_PAGE_MASK = VIRTUAL_PAGE_SIZE - 1, BOUNDARY_64K = 0xffff }; diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp index 0bda27644e..e6db7dca2e 100644 --- a/src/pal/src/init/pal.cpp +++ b/src/pal/src/init/pal.cpp @@ -18,6 +18,9 @@ Abstract: --*/ +#include "pal/dbgmsg.h" +SET_DEFAULT_DEBUG_CHANNEL(PAL); // some headers have code with asserts, so do this first + #include "pal/thread.hpp" #include "pal/synchobjects.hpp" #include "pal/procobj.hpp" @@ -27,7 +30,6 @@ Abstract: #include "../objmgr/shmobjectmanager.hpp" #include "pal/seh.hpp" #include "pal/palinternal.h" -#include "pal/dbgmsg.h" #include "pal/sharedmemory.h" #include "pal/shmemory.h" #include "pal/process.h" @@ -90,8 +92,6 @@ using namespace CorUnix; extern "C" BOOL CRTInitStdStreams( void ); -SET_DEFAULT_DEBUG_CHANNEL(PAL); - Volatile init_count = 0; Volatile shutdown_intent = 0; Volatile g_coreclrInitialized = 0; @@ -313,17 +313,6 @@ Initialize( } #endif // HAVE_MACH_EXCEPTIONS - // - // Initialize global thread data - // - - palError = InitializeGlobalThreadData(); - if (NO_ERROR != palError) - { - ERROR("Unable to initialize thread data\n"); - goto CLEANUP1; - } - // // Allocate the initial thread data // diff --git a/src/pal/src/loader/module.cpp b/src/pal/src/loader/module.cpp index a4fc4949e4..63a65ffb61 100644 --- a/src/pal/src/loader/module.cpp +++ b/src/pal/src/loader/module.cpp @@ -18,11 +18,13 @@ Abstract: --*/ +#include "pal/dbgmsg.h" +SET_DEFAULT_DEBUG_CHANNEL(LOADER); // some headers have code with asserts, so do this first + #include "pal/thread.hpp" #include "pal/malloc.hpp" #include "pal/file.hpp" #include "pal/palinternal.h" -#include "pal/dbgmsg.h" #include "pal/module.h" #include "pal/cs.hpp" #include "pal/process.h" @@ -60,8 +62,6 @@ Abstract: using namespace CorUnix; -SET_DEFAULT_DEBUG_CHANNEL(LOADER); - // In safemath.h, Template SafeInt uses macro _ASSERTE, which need to use variable // defdbgchan defined by SET_DEFAULT_DEBUG_CHANNEL. Therefore, the include statement // should be placed after the SET_DEFAULT_DEBUG_CHANNEL(LOADER) diff --git a/src/pal/src/loader/modulename.cpp b/src/pal/src/loader/modulename.cpp index 026f89b3ea..87c1b026c2 100644 --- a/src/pal/src/loader/modulename.cpp +++ b/src/pal/src/loader/modulename.cpp @@ -30,118 +30,10 @@ Abstract: #include #endif // NEED_DLCOMPAT -#if defined(_AIX) -#include -#endif - using namespace CorUnix; SET_DEFAULT_DEBUG_CHANNEL(LOADER); -#if defined(_AIX) -/*++ - GetLibRotorNameViaLoadQuery - - Retrieve the full path of the librotor_pal.so using loadquery() - -Parameters: - pszBuf - CHAR array of MAX_PATH_FNAME length - -Return value: - 0 on success - -1 on failure, with last error set ---*/ -int GetLibRotorNameViaLoadQuery(LPSTR pszBuf) -{ - CHAR* pLoadQueryBuf = NULL; - UINT cbBuf = 1024; - struct ld_info * pInfo = NULL; - INT iLQRetVal = -1; - INT iRetVal = -1; - CPalThread *pThread = NULL; - - if (!pszBuf) - { - ASSERT("GetLibRotorNameViaLoadQuery requires non-NULL pszBuf\n"); - SetLastError(ERROR_INTERNAL_ERROR); - goto Done; - } - - pThread = InternalGetCurrentThread(); - // Loop trying to call loadquery with enough memory until either - // 1) we succeed, 2) we run out of memory or 3) loadquery throws - // an error other than ENOMEM - while (iLQRetVal != 0) - { - pLoadQueryBuf = (CHAR*) InternalMalloc (pThread, cbBuf * sizeof(char)); - if (!pLoadQueryBuf) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto Done; - } - iLQRetVal = loadquery(L_GETINFO, pLoadQueryBuf, cbBuf); - if (iLQRetVal < 0) - { - free(pThread, pLoadQueryBuf); - pLoadQueryBuf = NULL; - DWORD dwLastError = GetLastError(); - if (dwLastError == ERROR_NOT_ENOUGH_MEMORY) - { - // The buffer's too small. Try twice as large as a guess... - cbBuf *= 2; - } - else - { - SetLastError(ERROR_INTERNAL_ERROR); - goto Done; - } - } - } - - // We successfully called loadquery, so now see if we can find - // librotor_pal.a in the module list - if (pLoadQueryBuf) - { - pInfo = (struct ld_info *)pLoadQueryBuf; - while (TRUE) - { - if (strstr(pInfo->ldinfo_filename, "librotor_pal.a")) - { - UINT cchFileName = strlen(pInfo->ldinfo_filename); - if (cchFileName + 1 > MAX_PATH_FNAME) - { - ASSERT("Filename returned by loadquery was longer than MAX_PATH_FNAME!\n"); - SetLastError(ERROR_INTERNAL_ERROR); - goto Done; - } - else - { - // The buffer should be large enough to accomodate the filename. - // So, we send in the size of the filename+1 - strcpy_s(pszBuf, MAX_PATH_FNAME, pInfo->ldinfo_filename); - iRetVal = 0; - goto Done; - } - } - else - { - // The (wacky) design of ld_info is that the value of next is an offset in - // bytes rather than a pointer. So we need this weird cast to char * to get - // the pointer math correct. - if (pInfo->ldinfo_next == 0) - break; - else - pInfo = (struct ld_info *) ((char *)pInfo + pInfo->ldinfo_next); - } - } - } -Done: - if (pLoadQueryBuf) - free(pThread, pLoadQueryBuf); - return iRetVal; -} -#endif // defined(_AIX) - /*++ PAL_dladdr @@ -165,31 +57,6 @@ Notes: --*/ const char *PAL_dladdr(LPVOID ProcAddress) { -#if defined(_AIX) || defined(__hppa__) - /* dladdr is not supported on AIX or 32-bit HPUX-PARISC */ - return (NULL); -#elif defined(_HPUX_) && defined(_IA64_) - /* dladdr is not supported on HP-UX/IA64. That said, PAL_dladdr just returns to module name - and we can get that via dlgetname. So use that for HPUX. */ - { - char* pszName = NULL; - load_module_desc desc; - __uint64_t uimodret = NULL; - uimodret = dlmodinfo((__uint64_t)ProcAddress, &desc, sizeof(desc), NULL, 0, 0); - if (!uimodret) - { - WARN("dlmodinfo call failed! dlerror says '%s'\n", dlerror()); - return NULL; - } - pszName = dlgetname(&desc, sizeof(desc), NULL, 0, 0); - if (!pszName) - { - WARN("dlgetname desc didn't describe a loaded module?! dlerror says '%s'\n", dlerror()); - return NULL; - } - return pszName; - } -#else Dl_info dl_info; if (!dladdr(ProcAddress, &dl_info)) { @@ -202,6 +69,5 @@ const char *PAL_dladdr(LPVOID ProcAddress) /* Return the module name */ return dl_info.dli_fname; } -#endif } diff --git a/src/pal/src/misc/dbgmsg.cpp b/src/pal/src/misc/dbgmsg.cpp index 488e61494e..d6f173f160 100644 --- a/src/pal/src/misc/dbgmsg.cpp +++ b/src/pal/src/misc/dbgmsg.cpp @@ -528,8 +528,8 @@ int DBG_printf_gcc(DBG_CHANNEL_ID channel, DBG_LEVEL_ID level, BOOL bHeader, va_start(args, format); - output_size+=Silent_PAL_vsnprintf(buffer_ptr, DBG_BUFFER_SIZE-output_size, - format, args); + output_size+=_vsnprintf_s(buffer_ptr, DBG_BUFFER_SIZE-output_size, _TRUNCATE, + format, args); va_end(args); if( output_size > DBG_BUFFER_SIZE ) @@ -633,8 +633,8 @@ int DBG_printf_c99(DBG_CHANNEL_ID channel, DBG_LEVEL_ID level, BOOL bHeader, } va_start(args, format); - output_size+=Silent_PAL_vsnprintf(buffer_ptr, DBG_BUFFER_SIZE-output_size, - format, args); + output_size+=_vsnprintf_s(buffer_ptr, DBG_BUFFER_SIZE-output_size, _TRUNCATE, + format, args); va_end(args); if(output_size>DBG_BUFFER_SIZE) @@ -960,7 +960,7 @@ void PAL_DisplayDialogFormatted(const char *szTitle, const char *szTextFormat, . const int cchBuffer = 4096; char *szBuffer = (char*)alloca(cchBuffer); - PAL__vsnprintf(szBuffer, cchBuffer, szTextFormat, args); + _vsnprintf_s(szBuffer, cchBuffer, _TRUNCATE, szTextFormat, args); PAL_DisplayDialog(szTitle, szBuffer); va_end(args); diff --git a/src/pal/src/misc/fmtmessage.cpp b/src/pal/src/misc/fmtmessage.cpp index 46e0af6e0d..70b854aa9c 100644 --- a/src/pal/src/misc/fmtmessage.cpp +++ b/src/pal/src/misc/fmtmessage.cpp @@ -205,7 +205,7 @@ static LPWSTR FMTMSG_ProcessPrintf( wchar_t c , UINT nFormatLength = 0; int nBufferLength = 0; - TRACE( "FMTMSG_ProcessPrintf( %C, %S, %S )\n", c, + TRACE( "FMTMSG_ProcessPrintf( %C, %S, %p )\n", c, lpPrintfString, lpInsertString ); switch ( c ) @@ -299,7 +299,6 @@ FormatMessageW( LPWSTR lpReturnString = NULL; LPWSTR lpWorkingString = NULL; - PERF_ENTRY(FormatMessageW); ENTRY( "FormatMessageW(dwFlags=%#x, lpSource=%p, dwMessageId=%#x, " "dwLanguageId=%#x, lpBuffer=%p, nSize=%u, va_list=%p)\n", diff --git a/src/pal/src/misc/perftrace.cpp b/src/pal/src/misc/perftrace.cpp index d4fba3367a..fdefdf6694 100644 --- a/src/pal/src/misc/perftrace.cpp +++ b/src/pal/src/misc/perftrace.cpp @@ -23,26 +23,6 @@ Abstract: #ifdef PAL_PERF -#ifndef PLATFORM_UNIX -/* PAL Headers */ -#include "perftrace.h" - -/* Standard Headers */ -#include -#include -#include -#include - -#define snprintf _snprintf -#define MiscGetenv getenv -#define pthread_getspecific TlsGetValue -#define THREADSilentGetCurrentThreadId GetCurrentThreadId -#define getpid GetCurrentProcessId -#define PAL_fgets fgets // on Windows, we want fgets. -#define PAL_fwrite fwrite // on Windows, we want fwrite. -#define PAL_fseek fseek // on Windows, we want fseek. - -#else /* PAL Headers */ #include "pal/palinternal.h" #include "pal/perftrace.h" @@ -60,7 +40,6 @@ Abstract: #include SET_DEFAULT_DEBUG_CHANNEL(MISC); -#endif //End of PLATFORM_UNIX #define PAL_PERF_MAX_LOGLINE 0x400 /* 1K */ @@ -110,21 +89,12 @@ typedef struct _pal_perf_program_info ULONGLONG total_duration; /* Total CPU clock ticks of all the threads */ ULONGLONG pal_duration; /* Total CPU clock ticks spent inside PAL */ -#ifndef PLATFORM_UNIX - DWORD process_id; -#else pid_t process_id; -#endif char start_time[32]; /* must be at least 26 characters */ } pal_perf_program_info; -#ifndef PLATFORM_UNIX -typedef FILE PERF_FILE; -#define PERF_FILEFN(x) x -#else typedef PAL_FILE PERF_FILE; #define PERF_FILEFN(x) PAL_ ## x -#endif static ULONGLONG PERFGetTicks(); static double PERFComputeStandardDeviation(pal_perf_api_info *api); @@ -144,11 +114,7 @@ typedef char PAL_API_NAME[PAL_PERF_MAX_FUNCTION_NAME]; static PAL_API_NAME API_list[PAL_API_NUMBER] ; static pal_perf_program_info program_info; -#ifndef PLATFORM_UNIX -static DWORD PERF_tlsTableKey=0 ; -#else static pthread_key_t PERF_tlsTableKey=0 ; -#endif static pal_thread_list_node * process_pal_thread_list=NULL; static BOOL pal_profile_on=FALSE; @@ -199,19 +165,11 @@ static const char PAL_PERF_HISTOGRAM_SIZE[]="PAL_PERF_HISTOGRAM_SIZE"; static const char PAL_PERF_HISTOGRAM_STEP[]="PAL_PERF_HISTOGRAM_STEP"; static const char traced_apis_filename[]="PerfTracedAPIs.txt"; static const char perf_enabled_filename[]="AllPerfEnabledAPIs.txt"; -#ifndef PLATFORM_UNIX -static const char PATH_SEPARATOR[] = "\\"; -#else static const char PATH_SEPARATOR[] = "/"; -#endif -#ifndef PLATFORM_UNIX -#define LLFORMAT "%I64u" -#else #define LLFORMAT "%llu" -#endif static ULONGLONG @@ -230,12 +188,8 @@ PERFGetTicks(){ #define volatile DoNotUseVolatileKeyword #endif return ((ULONGLONG)((unsigned int)(d)) << 32) | (unsigned int)(a); -#else -#ifdef __sparc__ - return (ULONGLONG)gethrtime(); #else return 0; // on non-BSD and non-Windows, we'll return 0 for now. -#endif // __sparc__ #endif // _X86_ } @@ -283,11 +237,7 @@ BOOL PERFInitProgramInfo(LPWSTR command_line, LPWSTR exe_path) { ULONGLONG start_tick; -#ifndef PLATFORM_UNIX - time_t tv; -#else struct timeval tv; -#endif if (WideCharToMultiByte(CP_ACP, 0, command_line, -1, program_info.command_line, PAL_PERF_MAX_LOGLINE-1, NULL, NULL) == 0) @@ -299,23 +249,14 @@ PERFInitProgramInfo(LPWSTR command_line, LPWSTR exe_path) gethostname(program_info.hostname, PAL_PERF_MAX_FUNCTION_NAME); program_info.process_id = getpid(); -#ifndef PLATFORM_UNIX - time( &tv ); - strcpy(program_info.start_time, ctime( &tv )); -#else gettimeofday(&tv, NULL); ctime_r(&tv.tv_sec, program_info.start_time); -#endif // estimate the cpu clock cycles start_tick = PERFGetTicks(); if (start_tick != 0) { -#ifndef PLATFORM_UNIX - Sleep(1000); //Sleep on Windows takes milliseconds as argument -#else sleep(1); -#endif program_info.cpu_clock_frequency = (double) (PERFGetTicks() - start_tick); } else @@ -379,13 +320,8 @@ PERFInitialize(LPWSTR command_line, LPWSTR exe_path) pal_profile_on = FALSE; // turn it off until we setup everything. // allocate the TLS index for structures -#ifndef PLATFORM_UNIX - if( ( PERF_tlsTableKey = TlsAlloc() ) == -1 ) - ret = FALSE; -#else if( pthread_key_create(&PERF_tlsTableKey , NULL) != 0 ) ret = FALSE; -#endif if( ret == TRUE ) { @@ -399,11 +335,7 @@ PERFInitialize(LPWSTR command_line, LPWSTR exe_path) else { -#ifndef PLATFORM_UNIX - TlsFree(PERF_tlsTableKey ); -#else pthread_key_delete(PERF_tlsTableKey ); -#endif ret = FALSE; } } @@ -426,11 +358,7 @@ void PERFTerminate( ) return; PERFlushAllLogs(); -#ifndef PLATFORM_UNIX - TlsFree(PERF_tlsTableKey ); -#else - pthread_key_delete(PERF_tlsTableKey ); -#endif + pthread_key_delete(PERF_tlsTableKey ); PAL_free(pal_function_map); } @@ -516,13 +444,8 @@ BOOL PERFAllocThreadInfo( ) local_info->start_ticks = 0; memset(log_buf, 0, PAL_PERF_PROFILE_BUFFER_SIZE); -#ifndef PLATFORM_UNIX - if ( TlsSetValue(PERF_tlsTableKey, local_info) == 0) - ret = FALSE; -#else if (pthread_setspecific(PERF_tlsTableKey, local_info) != 0) ret = FALSE; -#endif PERFAllocThreadInfoExit: if (ret == TRUE) @@ -799,11 +722,7 @@ PERFReadSetting( ) char * pal_perf_histogram_size_env; char * pal_perf_histogram_step_env; -#ifdef PLATFORM_UNIX PAL_FILE * hFile; -#else - FILE * hFile; -#endif if((pal_function_map == NULL) || (PAL_API_NUMBER < 0) ) { @@ -936,11 +855,7 @@ PERFReadSetting( ) if(input_file_name) { -#ifdef PLATFORM_UNIX hFile = PAL_fopen(input_file_name, "r+"); -#else - hFile = fopen(input_file_name, "r+"); -#endif if ( hFile == NULL ) { memset(pal_function_map, 1, PAL_API_NUMBER); @@ -979,11 +894,7 @@ PERFReadSetting( ) } -#ifdef PLATFORM_UNIX PAL_fclose(hFile); -#else - fclose(hFile); -#endif ret = TRUE; } } @@ -1031,11 +942,7 @@ PERFReadSetting( ) return ret; } -#ifdef PLATFORM_UNIX hFile = PAL_fopen(input_file_name, "r+"); -#else - hFile = fopen(input_file_name, "r+"); -#endif if ( hFile != NULL ) { @@ -1065,11 +972,7 @@ PERFReadSetting( ) } } -#ifdef PLATFORM_UNIX PAL_fclose(hFile); -#else - fclose(hFile); -#endif } return ret; @@ -1126,13 +1029,7 @@ PERFLogFunctionEntry(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick ) short bufused = 0; -#ifndef PLATFORM_UNIX - DWORD tv; - DWORD last_error; - last_error = GetLastError(); -#else struct timeval tv; -#endif if(!pal_perf_enabled || pal_function_map==NULL || !pal_profile_on ) // haven't initialize, just quit. @@ -1163,28 +1060,17 @@ PERFLogFunctionEntry(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick ) PERFFlushLog(local_info, FALSE); } -#ifndef PLATFORM_UNIX - tv = GetTickCount(); -#else gettimeofday(&tv, NULL); -#endif buf_off = local_info->buf_offset; -#ifndef PLATFORM_UNIX - bufused = snprintf(&write_buf[buf_off], PAL_PERF_MAX_LOGLINE, "----> %d %lu entry.\n", pal_api_id, tv ); -#else bufused = snprintf(&write_buf[buf_off], PAL_PERF_MAX_LOGLINE, "----> %d %lu %06u entry.\n", pal_api_id, tv.tv_sec, tv.tv_usec ); -#endif local_info->buf_offset += bufused; } if(nested_tracing) local_info->profile_enabled = TRUE; *pal_perf_start_tick = PERFGetTicks(); } -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif return; } @@ -1223,14 +1109,8 @@ PERFLogFunctionExit(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick ) short bufused = 0; DWORD off; ULONGLONG duration = 0; -#ifndef PLATFORM_UNIX - DWORD timev; - DWORD last_error; - last_error = GetLastError(); -#else struct timeval timev; -#endif if(!pal_perf_enabled || (pal_function_map == NULL) || !pal_profile_on ) // haven't initiallize yet, just quit. return; @@ -1257,17 +1137,10 @@ PERFLogFunctionExit(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick ) if(summary_only) { local_info->profile_enabled = TRUE; -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif return; } -#ifndef PLATFORM_UNIX - timev = GetTickCount(); -#else gettimeofday(&timev, NULL); -#endif buf = local_info->pal_write_buf; if(local_info->buf_offset >= PAL_PERF_BUFFER_FULL) @@ -1276,17 +1149,10 @@ PERFLogFunctionExit(unsigned int pal_api_id, ULONGLONG *pal_perf_start_tick ) } off = local_info->buf_offset; -#ifndef PLATFORM_UNIX - bufused = snprintf(&buf[off], PAL_PERF_MAX_LOGLINE, "<---- %d %lu exit. \n", pal_api_id, timev); -#else bufused = snprintf(&buf[off], PAL_PERF_MAX_LOGLINE, "<---- %d %lu %06u exit. \n", pal_api_id, timev.tv_sec, timev.tv_usec ); -#endif local_info->buf_offset += bufused; local_info->profile_enabled = TRUE; } -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif return; } @@ -1295,10 +1161,6 @@ PERFNoLatencyProfileEntry(unsigned int pal_api_id ) { pal_perf_thread_info * local_info=NULL; pal_perf_api_info * table; -#ifndef PLATFORM_UNIX - DWORD last_error; - last_error = GetLastError(); -#endif if(!pal_perf_enabled || pal_function_map==NULL || !pal_profile_on ) // haven't initialize, just quit. return; @@ -1307,9 +1169,6 @@ PERFNoLatencyProfileEntry(unsigned int pal_api_id ) local_info= (pal_perf_thread_info * )pthread_getspecific(PERF_tlsTableKey); if (local_info==NULL ) { -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif return; } else{ @@ -1317,9 +1176,6 @@ PERFNoLatencyProfileEntry(unsigned int pal_api_id ) table[pal_api_id].entries++; } } -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif return; } @@ -1328,10 +1184,6 @@ void PERFEnableThreadProfile(BOOL isInternal) { pal_perf_thread_info * local_info; -#ifndef PLATFORM_UNIX - DWORD last_error; - last_error = GetLastError(); -#endif if (!pal_perf_enabled) return; if (NULL != (local_info = (pal_perf_thread_info*)pthread_getspecific(PERF_tlsTableKey))) @@ -1341,9 +1193,6 @@ PERFEnableThreadProfile(BOOL isInternal) local_info->start_ticks = PERFGetTicks(); } } -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif } @@ -1351,10 +1200,6 @@ void PERFDisableThreadProfile(BOOL isInternal) { pal_perf_thread_info * local_info; -#ifndef PLATFORM_UNIX - DWORD last_error; - last_error = GetLastError(); -#endif if (!pal_perf_enabled) return; if (NULL != (local_info = (pal_perf_thread_info*)pthread_getspecific(PERF_tlsTableKey))) @@ -1364,9 +1209,6 @@ PERFDisableThreadProfile(BOOL isInternal) local_info->total_duration = PERFGetTicks() - local_info->start_ticks; } } -#ifndef PLATFORM_UNIX - SetLastError( last_error ); -#endif } @@ -1406,29 +1248,17 @@ static char * PERFIsValidPath( const char * path ) { -#ifndef PLATFORM_UNIX - DWORD result; -#else DIR * dir; -#endif if(( path==NULL) || (strlen(path)==0)) return NULL; -#ifndef PLATFORM_UNIX - result = GetFileAttributesA( path ); - if ((result != INVALID_FILE_ATTRIBUTES) && (result & FILE_ATTRIBUTE_DIRECTORY)) - { - return ((char *) path ); - } -#else dir = opendir(path); if( dir!=NULL) { closedir(dir); return ((char *)path); } -#endif return NULL; } @@ -1508,13 +1338,6 @@ PAL_GetCpuTickCount(VOID) return PERFGetTicks(); } -#ifndef PLATFORM_UNIX -#undef snprintf -#undef MiscGetenv -#undef pthread_key_t -#undef pthread_getspecific -#endif /* ifndef PLATFORM_UNIX definitions */ - #endif /* PAL_PERF */ diff --git a/src/pal/src/misc/sysinfo.cpp b/src/pal/src/misc/sysinfo.cpp index e7589e8583..3ccb35ab81 100644 --- a/src/pal/src/misc/sysinfo.cpp +++ b/src/pal/src/misc/sysinfo.cpp @@ -76,11 +76,6 @@ Revision History: SET_DEFAULT_DEBUG_CHANNEL(MISC); -#if defined(_HPUX_) && ( defined (_IA64_) || defined (__hppa__) ) -#include -#include -#endif - #ifndef __APPLE__ #if HAVE_SYSCONF && HAVE__SC_AVPHYS_PAGES #define SYSCONF_PAGES _SC_AVPHYS_PAGES @@ -135,22 +130,11 @@ GetSystemInfo( lpSystemInfo->dwActiveProcessorMask_PAL_Undefined = 0; #if HAVE_SYSCONF -#if defined(_HPUX_) && ( defined (_IA64_) || defined (__hppa__) ) - struct pst_dynamic psd; - if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) != -1) { - nrcpus = psd.psd_proc_cnt; - } - else { - ASSERT("pstat_getdynamic failed (%d)\n", errno); - } - -#else // !__hppa__ nrcpus = sysconf(_SC_NPROCESSORS_ONLN); if (nrcpus < 1) { ASSERT("sysconf failed for _SC_NPROCESSORS_ONLN (%d)\n", errno); } -#endif // __hppa__ #elif HAVE_SYSCTL int rc; size_t sz; @@ -171,7 +155,7 @@ GetSystemInfo( #ifdef VM_MAXUSER_ADDRESS lpSystemInfo->lpMaximumApplicationAddress = (PVOID) VM_MAXUSER_ADDRESS; -#elif defined(__sun__) || defined(_AIX) || defined(__hppa__) || ( defined (_IA64_) && defined (_HPUX_) ) || defined(__linux__) +#elif defined(__linux__) lpSystemInfo->lpMaximumApplicationAddress = (PVOID) (1ull << 47); #elif defined(USERLIMIT) lpSystemInfo->lpMaximumApplicationAddress = (PVOID) USERLIMIT; diff --git a/src/pal/src/misc/utils.cpp b/src/pal/src/misc/utils.cpp index 1e333d19ac..f0ff63439f 100644 --- a/src/pal/src/misc/utils.cpp +++ b/src/pal/src/misc/utils.cpp @@ -18,21 +18,21 @@ Abstract: --*/ +#include "pal/dbgmsg.h" +SET_DEFAULT_DEBUG_CHANNEL(MISC); // some headers have code with asserts, so do this first + #include "pal/palinternal.h" #if HAVE_VM_ALLOCATE #include #endif //HAVE_VM_ALLOCATE #include "pal/utils.h" -#include "pal/dbgmsg.h" #include "pal/file.h" #include #include -SET_DEFAULT_DEBUG_CHANNEL(MISC); - // In safemath.h, Template SafeInt uses macro _ASSERTE, which need to use variable // defdbgchan defined by SET_DEFAULT_DEBUG_CHANNEL. Therefore, the include statement // should be placed after the SET_DEFAULT_DEBUG_CHANNEL(MISC) diff --git a/src/pal/src/safecrt/cruntime.h b/src/pal/src/safecrt/cruntime.h index cdad474e53..7341a388b6 100644 --- a/src/pal/src/safecrt/cruntime.h +++ b/src/pal/src/safecrt/cruntime.h @@ -36,11 +36,11 @@ #endif /* defined (_SYSCRT) && defined (_WIN64) */ #if !defined (UNALIGNED) -#if defined (_M_IA64) || defined (_M_AMD64) +#if defined (_M_AMD64) #define UNALIGNED __unaligned -#else /* defined (_M_IA64) || defined (_M_AMD64) */ +#else /* defined (_M_AMD64) */ #define UNALIGNED -#endif /* defined (_M_IA64) || defined (_M_AMD64) */ +#endif /* defined (_M_AMD64) */ #endif /* !defined (UNALIGNED) */ #ifdef _M_IX86 @@ -57,9 +57,9 @@ #define REG8 #define REG9 -#elif defined (_M_IA64) || defined (_M_AMD64) +#elif defined (_M_AMD64) /* - * IA64 + * AMD64 */ #define REG1 register #define REG2 register @@ -71,7 +71,7 @@ #define REG8 register #define REG9 register -#else /* defined (_M_IA64) || defined (_M_AMD64) */ +#else /* defined (_M_AMD64) */ #pragma message ("Machine register set not defined") @@ -89,7 +89,7 @@ #define REG8 #define REG9 -#endif /* defined (_M_IA64) || defined (_M_AMD64) */ +#endif /* defined (_M_AMD64) */ /* * Are the macro definitions below still needed in this file? diff --git a/src/pal/src/safecrt/sscanf_s.cpp b/src/pal/src/safecrt/sscanf_s.cpp index 4f548bccc6..7a481b580f 100644 --- a/src/pal/src/safecrt/sscanf_s.cpp +++ b/src/pal/src/safecrt/sscanf_s.cpp @@ -21,7 +21,7 @@ typedef int (*INPUTFN)(miniFILE *, const unsigned char*, va_list); typedef int (*WINPUTFN)(miniFILE *, const wchar_t*, va_list); - +extern size_t PAL_wcsnlen(const WCHAR* inString, size_t inMaxSize); /*** *static int v[nw]scan_fn([w]inputfn, string, [count], format, ...) @@ -115,7 +115,7 @@ static int __cdecl vwscan_fn ( miniFILE str; miniFILE *infile = &str; int retval; - size_t count = wcsnlen(string, INT_MAX); + size_t count = PAL_wcsnlen(string, INT_MAX); _VALIDATE_RETURN( (string != NULL), EINVAL, EOF); _VALIDATE_RETURN( (format != NULL), EINVAL, EOF); @@ -149,7 +149,7 @@ static int __cdecl vnwscan_fn ( miniFILE str; miniFILE *infile = &str; int retval; - size_t length = wcsnlen(string, INT_MAX); + size_t length = PAL_wcsnlen(string, INT_MAX); _VALIDATE_RETURN( (string != NULL), EINVAL, EOF); _VALIDATE_RETURN( (format != NULL), EINVAL, EOF); diff --git a/src/pal/src/safecrt/wcslen_s.cpp b/src/pal/src/safecrt/wcslen_s.cpp index 4fd5371035..0688148b5d 100644 --- a/src/pal/src/safecrt/wcslen_s.cpp +++ b/src/pal/src/safecrt/wcslen_s.cpp @@ -42,7 +42,7 @@ * *******************************************************************************/ -size_t __cdecl wcsnlen(const wchar_t *wcs, size_t maxsize) +size_t __cdecl PAL_wcsnlen(const wchar_t *wcs, size_t maxsize) { size_t n; diff --git a/src/pal/src/shmemory/shmemory.cpp b/src/pal/src/shmemory/shmemory.cpp index 42e06be834..35dadd6b3a 100644 --- a/src/pal/src/shmemory/shmemory.cpp +++ b/src/pal/src/shmemory/shmemory.cpp @@ -189,10 +189,6 @@ SET_DEFAULT_DEBUG_CHANNEL(SHMEM); #define SEGMENT_NAME_SUFFIX_LENGTH 10 -#if defined(_DEBUG) && defined(_HPUX_) -#define TRACK_SHMLOCK_OWNERSHIP -#endif // _DEBUG && _HPUX_ - /* SHMPTR structure : High byte is SHM segment number @@ -808,24 +804,6 @@ int SHMLock(void) CHECK_CANARIES(header); #endif // TRACK_SHMLOCK_OWNERSHIP -#ifdef _HPUX_ - // - // TODO: workaround for VSW # 381564 - // - if (0 == tmp_pid && my_pid != header->spinlock) - { - ERROR("InterlockedCompareExchange returned the Comperand but " - "failed to store the Exchange value to the Destination: " - "looping again [my_pid=%u header->spinlock=%u tmp_pid=%u " - "spincount=%d locking_thread=%u]\n", (DWORD)my_pid, - (DWORD)header->spinlock, (DWORD)tmp_pid, (int)spincount, - (HANDLE)locking_thread); - - // Keep looping - tmp_pid = 42; - } -#endif // _HPUX_ - if (0 == tmp_pid) { // Spinlock acquired: break out of the loop @@ -964,31 +942,17 @@ int SHMRelease(void) #endif // TRACK_SHMLOCK_OWNERSHIP -#ifdef _HPUX_ - // - // TODO: workaround for VSW # 381564 - // - do -#endif // _HPUX_ - { - /* Make sure we don't touch the spinlock if we don't own it. We're - supposed to own it if we get here, but just in case... */ - tmp_pid = InterlockedCompareExchange((LONG *) &header->spinlock, 0, my_pid); + /* Make sure we don't touch the spinlock if we don't own it. We're + supposed to own it if we get here, but just in case... */ + tmp_pid = InterlockedCompareExchange((LONG *) &header->spinlock, 0, my_pid); - if (tmp_pid != my_pid) - { - ASSERT("Process 0x%08x tried to release spinlock owned by process " - "0x%08x! \n", my_pid, tmp_pid); - PALCLeaveCriticalSection(&shm_critsec); - return 0; - } + if (tmp_pid != my_pid) + { + ASSERT("Process 0x%08x tried to release spinlock owned by process " + "0x%08x! \n", my_pid, tmp_pid); + PALCLeaveCriticalSection(&shm_critsec); + return 0; } -#ifdef _HPUX_ - // - // TODO: workaround for VSW # 381564 - // - while (my_pid == header->spinlock); -#endif // _HPUX_ /* indicate no thread (in this process) holds the SHM lock */ locking_thread = 0; diff --git a/src/pal/src/thread/process.cpp b/src/pal/src/thread/process.cpp index a64bfb8ab1..ae069aec86 100644 --- a/src/pal/src/thread/process.cpp +++ b/src/pal/src/thread/process.cpp @@ -18,6 +18,9 @@ Abstract: --*/ +#include "pal/dbgmsg.h" +SET_DEFAULT_DEBUG_CHANNEL(PROCESS); // some headers have code with asserts, so do this first + #include "pal/procobj.hpp" #include "pal/thread.hpp" #include "pal/file.hpp" @@ -29,7 +32,6 @@ Abstract: #include "pal/init.h" #include "pal/critsect.h" #include "pal/debug.h" -#include "pal/dbgmsg.h" #include "pal/utils.h" #include "pal/environ.h" #include "pal/virtual.h" @@ -67,8 +69,6 @@ Abstract: using namespace CorUnix; -SET_DEFAULT_DEBUG_CHANNEL(PROCESS); - CObjectType CorUnix::otProcess( otiProcess, NULL, @@ -1453,7 +1453,7 @@ static uint64_t HashSemaphoreName(uint64_t a, uint64_t b) #define HashSemaphoreName(a,b) a,b #endif -static const char* PipeNameFormat = "/tmp/clr-debug-pipe-%d-%llu-%s"; +static const char* PipeNameFormat = TEMP_DIRECTORY_PATH "clr-debug-pipe-%d-%llu-%s"; class PAL_RuntimeStartupHelper { @@ -1879,7 +1879,7 @@ Parameters: None Return value: - TRUE - succeeded, FALSE - failed + TRUE - successfully launched by debugger, FALSE - not launched or some failure in the handshake --*/ BOOL PALAPI @@ -1889,7 +1889,7 @@ PAL_NotifyRuntimeStarted() char continueSemName[CLR_SEM_MAX_NAMELEN]; sem_t *startupSem = SEM_FAILED; sem_t *continueSem = SEM_FAILED; - BOOL result = TRUE; + BOOL launched = FALSE; UINT64 processIdDisambiguationKey = 0; GetProcessIdDisambiguationKey(gPID, &processIdDisambiguationKey); @@ -1899,9 +1899,7 @@ PAL_NotifyRuntimeStarted() TRACE("PAL_NotifyRuntimeStarted opening continue '%s' startup '%s'\n", continueSemName, startupSemName); - - // Open the debugger startup semaphore. If it doesn't exists, then we do nothing and - // the function is successful. + // Open the debugger startup semaphore. If it doesn't exists, then we do nothing and return startupSem = sem_open(startupSemName, 0); if (startupSem == SEM_FAILED) { @@ -1913,7 +1911,6 @@ PAL_NotifyRuntimeStarted() if (continueSem == SEM_FAILED) { ASSERT("sem_open(%s) failed: %d (%s)\n", continueSemName, errno, strerror(errno)); - result = FALSE; goto exit; } @@ -1921,7 +1918,6 @@ PAL_NotifyRuntimeStarted() if (sem_post(startupSem) != 0) { ASSERT("sem_post(startupSem) failed: errno is %d (%s)\n", errno, strerror(errno)); - result = FALSE; goto exit; } @@ -1929,10 +1925,12 @@ PAL_NotifyRuntimeStarted() if (sem_wait(continueSem) != 0) { ASSERT("sem_wait(continueSem) failed: errno is %d (%s)\n", errno, strerror(errno)); - result = FALSE; goto exit; } + // Returns that the runtime was successfully launched for debugging + launched = TRUE; + exit: if (startupSem != SEM_FAILED) { @@ -1942,7 +1940,7 @@ exit: { sem_close(continueSem); } - return result; + return launched; } /*++ diff --git a/src/pal/src/thread/thread.cpp b/src/pal/src/thread/thread.cpp index 566ef855b4..53283320c5 100644 --- a/src/pal/src/thread/thread.cpp +++ b/src/pal/src/thread/thread.cpp @@ -34,6 +34,8 @@ SET_DEFAULT_DEBUG_CHANNEL(THREAD); // some headers have code with asserts, so do #include "pal/module.h" #include "pal/environ.h" #include "pal/init.h" +#include "pal/utils.h" +#include "pal/virtual.h" #if defined(__NetBSD__) && !HAVE_PTHREAD_GETCPUCLOCKID #include @@ -77,13 +79,6 @@ using namespace CorUnix; /* ------------------- Definitions ------------------------------*/ -// The default stack size of a newly created thread (currently 256KB) -// when the dwStackSize parameter of PAL_CreateThread() -// is zero. This value can be set by setting the -// environment variable PAL_THREAD_DEFAULT_STACK_SIZE -// (the value should be in bytes and in hex). -DWORD CPalThread::s_dwDefaultThreadStackSize = 256*1024; - /* list of free CPalThread objects */ static Volatile free_threads_list = NULL; @@ -528,6 +523,7 @@ CorUnix::InternalCreateThread( #endif // PTHREAD_CREATE_MODIFIES_ERRNO BOOL fHoldingProcessLock = FALSE; int iError = 0; + size_t alignedStackSize; if (0 != terminator) { @@ -573,7 +569,24 @@ CorUnix::InternalCreateThread( palError = ERROR_INVALID_PARAMETER; goto EXIT; } - + + alignedStackSize = dwStackSize; + if (alignedStackSize != 0) + { + // Some systems require the stack size to be aligned to the page size + if (sizeof(alignedStackSize) <= sizeof(dwStackSize) && alignedStackSize + (VIRTUAL_PAGE_SIZE - 1) < alignedStackSize) + { + // When coming here from the public API surface, the incoming value is originally a nonnegative signed int32, so + // this shouldn't happen + ASSERT( + "Couldn't align the requested stack size (%Iu) to the page size because the stack size was too large\n", + alignedStackSize); + palError = ERROR_INVALID_PARAMETER; + goto EXIT; + } + alignedStackSize = ALIGN_UP(alignedStackSize, VIRTUAL_PAGE_SIZE); + } + // Ignore the STACK_SIZE_PARAM_IS_A_RESERVATION flag dwCreationFlags &= ~STACK_SIZE_PARAM_IS_A_RESERVATION; @@ -616,42 +629,34 @@ CorUnix::InternalCreateThread( fAttributesInitialized = TRUE; /* adjust the stack size if necessary */ - if (0 != pthread_attr_getstacksize(&pthreadAttr, &pthreadStackSize)) + if (alignedStackSize != 0) { - ERROR("couldn't set thread stack size\n"); - palError = ERROR_INTERNAL_ERROR; - goto EXIT; - } - - TRACE("default pthread stack size is %d, caller requested %d (default is %d)\n", - pthreadStackSize, dwStackSize, CPalThread::s_dwDefaultThreadStackSize); - - if (0 == dwStackSize) - { - dwStackSize = CPalThread::s_dwDefaultThreadStackSize; - } - #ifdef PTHREAD_STACK_MIN - if (PTHREAD_STACK_MIN > pthreadStackSize) - { - WARN("default stack size is reported as %d, but PTHREAD_STACK_MIN is " - "%d\n", pthreadStackSize, PTHREAD_STACK_MIN); - } -#endif - - if (pthreadStackSize < dwStackSize) - { - TRACE("setting thread stack size to %d\n", dwStackSize); - if (0 != pthread_attr_setstacksize(&pthreadAttr, dwStackSize)) + const size_t MinStackSize = PTHREAD_STACK_MIN; +#else // !PTHREAD_STACK_MIN + const size_t MinStackSize = 64 * 1024; // this value is typically accepted by pthread_attr_setstacksize() +#endif // PTHREAD_STACK_MIN + _ASSERTE(IS_ALIGNED(MinStackSize, VIRTUAL_PAGE_SIZE)); + if (alignedStackSize < MinStackSize) { - ERROR("couldn't set pthread stack size to %d\n", dwStackSize); + // Adjust the stack size to a minimum value that is likely to be accepted by pthread_attr_setstacksize(). If this + // function fails, typically the caller will end up throwing OutOfMemoryException under the assumption that the + // requested stack size is too large or the system does not have sufficient memory to create a thread. Try to + // prevent failing just just because the stack size value is too low. + alignedStackSize = MinStackSize; + } + + TRACE("setting thread stack size to %Iu\n", alignedStackSize); + if (0 != pthread_attr_setstacksize(&pthreadAttr, alignedStackSize)) + { + ERROR("couldn't set pthread stack size to %Iu\n", alignedStackSize); palError = ERROR_INTERNAL_ERROR; goto EXIT; } } else { - TRACE("using the system default thread stack size of %d\n", pthreadStackSize); + TRACE("using the system default thread stack size\n"); } #if HAVE_THREAD_SELF || HAVE__LWP_SELF @@ -1755,39 +1760,6 @@ fail: return NULL; } - -#define PAL_THREAD_DEFAULT_STACK_SIZE "PAL_THREAD_DEFAULT_STACK_SIZE" - -PAL_ERROR -CorUnix::InitializeGlobalThreadData( - void - ) -{ - PAL_ERROR palError = NO_ERROR; - char *pszStackSize = NULL; - - // - // Read in the environment to see whether we need to change the default - // thread stack size. - // - pszStackSize = EnvironGetenv(PAL_THREAD_DEFAULT_STACK_SIZE); - if (NULL != pszStackSize) - { - // Environment variable exists - char *pszEnd; - DWORD dw = PAL_strtoul(pszStackSize, &pszEnd, 16); // treat it as hex - if ( (pszStackSize != pszEnd) && (0 != dw) ) - { - CPalThread::s_dwDefaultThreadStackSize = dw; - } - - free(pszStackSize); - } - - return palError; -} - - /*++ Function: CreateThreadData diff --git a/src/pal/src/thread/threadsusp.cpp b/src/pal/src/thread/threadsusp.cpp index b31b88da59..c7787bef68 100644 --- a/src/pal/src/thread/threadsusp.cpp +++ b/src/pal/src/thread/threadsusp.cpp @@ -36,16 +36,6 @@ Revision History: #include #include -#if defined(_AIX) -// AIX requires explicit definition of the union semun (see semctl man page) -union semun -{ - int val; - struct semid_ds * buf; - unsigned short * array; -}; -#endif - using namespace CorUnix; /* ------------------- Definitions ------------------------------*/ diff --git a/src/pal/tests/palsuite/CMakeLists.txt b/src/pal/tests/palsuite/CMakeLists.txt index 235b695961..0ea8969bab 100644 --- a/src/pal/tests/palsuite/CMakeLists.txt +++ b/src/pal/tests/palsuite/CMakeLists.txt @@ -4,6 +4,16 @@ project(PALTESTSUITE) include_directories(${PALTESTSUITE_SOURCE_DIR}/common) +# All test will link against these libraries: +# pthread and m are part of the Android C library (bionic), +# so we don't need to link them seperately +if(NOT CLR_CMAKE_PLATFORM_ANDROID) + list(APPEND COMMON_TEST_LIBRARIES pthread) + list(APPEND COMMON_TEST_LIBRARIES m) +endif() + +list(APPEND COMMON_TEST_LIBRARIES coreclrpal) + add_compile_options(-Wno-incompatible-pointer-types-discards-qualifiers) add_compile_options(-Wno-int-to-void-pointer-cast) diff --git a/src/pal/tests/palsuite/c_runtime/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/CMakeLists.txt index cf062530eb..7a6b2cd919 100644 --- a/src/pal/tests/palsuite/c_runtime/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/CMakeLists.txt @@ -148,7 +148,6 @@ add_subdirectory(_fullpath) # TODO: make this test compile # add_subdirectory(_gcvt) -add_subdirectory(_getw) add_subdirectory(_isnan) add_subdirectory(_isnanf) add_subdirectory(_itow) @@ -157,7 +156,6 @@ add_subdirectory(_mbsinc) add_subdirectory(_mbsninc) add_subdirectory(_open_osfhandle) add_subdirectory(_putenv) -add_subdirectory(_putw) add_subdirectory(_rotl) add_subdirectory(_rotr) add_subdirectory(_snprintf_s) @@ -165,7 +163,7 @@ add_subdirectory(_snwprintf_s) add_subdirectory(_stricmp) add_subdirectory(_strlwr) add_subdirectory(_strnicmp) -add_subdirectory(_vsnprintf) +add_subdirectory(_vsnprintf_s) add_subdirectory(_vsnwprintf_s) add_subdirectory(_wcsicmp) add_subdirectory(_wcslwr) diff --git a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt index b4421e77a1..4dd4cf13f0 100644 --- a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_iscsym_test1 add_dependencies(paltest_iscsym_test1 coreclrpal) target_link_libraries(paltest_iscsym_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt index 434633be20..97a351c802 100644 --- a/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_alloca_test1 add_dependencies(paltest_alloca_test1 coreclrpal) target_link_libraries(paltest_alloca_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt index e78a802723..152271cf59 100644 --- a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ecvt_test1 add_dependencies(paltest_ecvt_test1 coreclrpal) target_link_libraries(paltest_ecvt_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt index 60b036f44d..a389b8330a 100644 --- a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fdopen_test1 add_dependencies(paltest_fdopen_test1 coreclrpal) target_link_libraries(paltest_fdopen_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt index ac2f25d85a..a376d45be8 100644 --- a/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_finite_test1 add_dependencies(paltest_finite_test1 coreclrpal) target_link_libraries(paltest_finite_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt index 9ef630fbb2..a9785e0620 100644 --- a/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_finitef/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_finitef_test1 add_dependencies(paltest_finitef_test1 coreclrpal) target_link_libraries(paltest_finitef_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt index 0c9029f6e2..2915738103 100644 --- a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fullpath_test1 add_dependencies(paltest_fullpath_test1 coreclrpal) target_link_libraries(paltest_fullpath_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt index 47dcb95754..25c652dfcb 100644 --- a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gcvt_test1 add_dependencies(paltest_gcvt_test1 coreclrpal) target_link_libraries(paltest_gcvt_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt index 5b0f5608f3..b77bff9cdd 100644 --- a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gcvt_test2 add_dependencies(paltest_gcvt_test2 coreclrpal) target_link_libraries(paltest_gcvt_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_getw/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt deleted file mode 100644 index 4f763bed6b..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test1.cpp -) - -add_executable(paltest_getw_test1 - ${SOURCES} -) - -add_dependencies(paltest_getw_test1 coreclrpal) - -target_link_libraries(paltest_getw_test1 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat b/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat deleted file mode 100644 index b20eae054c..0000000000 Binary files a/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat and /dev/null differ diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp deleted file mode 100644 index 34ce4ee7de..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================================ -** -** Source: test1.c -** -** Purpose: Several integers are read from a previously written file -** using _getw. The test passes if the values read match those known to -** be in the file. -** -** -**==========================================================================*/ - -#include - -/*Tests _getw using a previously written data file */ -int __cdecl main(int argc, char **argv) -{ - const int testValues[] = - { - 0, - 1, - -1, - 0x7FFFFFFF, /* largest positive integer on 32 bit systems */ - 0x80000000, /* largest negative integer on 32 bit systems */ - 0xFFFFFFFF, - 0xFFFFAAAA - }; - - int i = 0; - int input = 0; - - const char filename[] = "test.dat"; - - - FILE *fp = NULL; - - /* - * Initialize the PAL and return FAIL if this fails - */ - if (0 != (PAL_Initialize(argc, argv))) - { - return FAIL; - } - - /* write the file that we will use to test */ - - - /* - Don't uncomment this code, it was used to create the data file - initially on windows, but if it is run on all test platforms, the - tests will always pass. - - fp = fopen(filename, "w"); - if (fp == NULL) - { - Fail("Unable to open file for write.\n"); - } - for (i = 0; i < sizeof(testValues) / sizeof(testValues[0]); i++) - { - _putw(testValues[i], fp); - } - - if (fclose(fp) != 0) - { - Fail("Error closing file after writing to it with _putw.\n"); - } - */ - - - /*Now read values back from the file and see if they match.*/ - fp = fopen(filename, "r"); - if (fp == NULL) - { - Fail ("Unable to open file for read.\n"); - } - for (i = 0; i < sizeof(testValues) / sizeof(testValues[0]); i++) - { - input = _getw(fp); - if (VAL32(input) != testValues[i]) - { - Fail ("_getw did not get the expected values when reading " - "from a file.\n"); - } - } - - if (fclose(fp) != 0) - { - Fail ("Error closing file after reading from it with _getw\n"); - } - PAL_Terminate(); - return PASS; -} - diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat deleted file mode 100644 index 4044dadbcc..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_getw/test1/testinfo.dat +++ /dev/null @@ -1,15 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _getw -Name = Positive Test for _getw -TYPE = DEFAULT -EXE1 = test1 -Description -=Several integers are read from a previously written file -=using _getw. The test passes if the values read match those known to -=be in the file. - diff --git a/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt index 106ccb93d7..8c949ed001 100644 --- a/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isnan_test1 add_dependencies(paltest_isnan_test1 coreclrpal) target_link_libraries(paltest_isnan_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt index a8d42aa975..485c30ec3f 100644 --- a/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_isnanf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isnanf_test1 add_dependencies(paltest_isnanf_test1 coreclrpal) target_link_libraries(paltest_isnanf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt index 2c5d57bd34..bbeeb484e0 100644 --- a/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_itow_test1 add_dependencies(paltest_itow_test1 coreclrpal) target_link_libraries(paltest_itow_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt index b016f27982..96319ac3b0 100644 --- a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mbsdec_test1 add_dependencies(paltest_mbsdec_test1 coreclrpal) target_link_libraries(paltest_mbsdec_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt index c7325b9513..7e3a015e5f 100644 --- a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mbsinc_test1 add_dependencies(paltest_mbsinc_test1 coreclrpal) target_link_libraries(paltest_mbsinc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt index 81c6c23a53..26a44c9010 100644 --- a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mbsninc_test1 add_dependencies(paltest_mbsninc_test1 coreclrpal) target_link_libraries(paltest_mbsninc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt index f4fedb61ae..503a6d928c 100644 --- a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_open_osfhandle_test1 add_dependencies(paltest_open_osfhandle_test1 coreclrpal) target_link_libraries(paltest_open_osfhandle_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt index 6086868de2..e37cec2db3 100644 --- a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_open_osfhandle_test2 add_dependencies(paltest_open_osfhandle_test2 coreclrpal) target_link_libraries(paltest_open_osfhandle_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt index 9096bc1033..e49d53f82a 100644 --- a/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_putenv_test1 add_dependencies(paltest_putenv_test1 coreclrpal) target_link_libraries(paltest_putenv_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt index ad99eba373..6c6d139b77 100644 --- a/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_putenv_test2 add_dependencies(paltest_putenv_test2 coreclrpal) target_link_libraries(paltest_putenv_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt index fc97b951b3..2d98fd18ec 100644 --- a/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_putenv_test3 add_dependencies(paltest_putenv_test3 coreclrpal) target_link_libraries(paltest_putenv_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt index 3881626d01..9bcd973558 100644 --- a/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_putenv_test4 add_dependencies(paltest_putenv_test4 coreclrpal) target_link_libraries(paltest_putenv_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt deleted file mode 100644 index f6aa0cb2d9..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_putw/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) - diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt deleted file mode 100644 index 78833d4e13..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test1.cpp -) - -add_executable(paltest_putw_test1 - ${SOURCES} -) - -add_dependencies(paltest_putw_test1 coreclrpal) - -target_link_libraries(paltest_putw_test1 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp deleted file mode 100644 index 02b7cc7a49..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================================ -** -** Source: test1.c -** -** Purpose: Writes a series of integers to a file, test.dat, -** then verifies the results. -** -** Dependency: fopen(...) -** fclose(...) -** CloseHandle(...) -** DeleteFileA(...) -** _getw(...) -** -** -** -**==========================================================================*/ - - -#include - -const char testFileName[] = "test.dat"; - -static void Cleanup(HANDLE hFile) -{ - if (fclose((PAL_FILE*)hFile)) - { - Trace("_putw: ERROR -> Unable to close file \"%s\".\n", - testFileName); - } - if (!DeleteFileA(testFileName)) - { - Trace("_putw: ERROR -> Unable to delete file \"%s\". ", - "GetLastError returned %u.\n", - testFileName, - GetLastError()); - } -} - - -int __cdecl main(int argc, char **argv) -{ - - FILE * pfTest = NULL; - int testArray[] = {0,1,-1,0x7FFFFFFF,0x80000000,0xFFFFFFFF,0xFFFFAAAA}; - int i = 0; - int retValue = 0; - - /* - * Initialize the PAL and return FAIL if this fails - */ - if (0 != (PAL_Initialize(argc, argv))) - { - return FAIL; - } - - /*write the file that we will use to test */ - pfTest = fopen(testFileName, "w"); - if (pfTest == NULL) - { - Fail ("Unable to write test file.\n"); - } - - for (i = 0; i < sizeof(testArray)/sizeof(int) ; i++) - { - _putw(testArray[i], pfTest); - - if( ferror( pfTest ) ) - { - Cleanup(pfTest); - Fail( "Error:in _putw -> error has occurred in the " - "stream while writing to the file: \"test.dat\"\n"); - } - - } - - if (fclose(pfTest) != 0) - { - Cleanup(pfTest); - Fail ("Error closing file after writing with _putw(..).\n"); - } - - /*open the new test file and compare*/ - pfTest = fopen(testFileName, "r"); - if (pfTest == NULL) - { - Fail ("Error opening \"%s\", which is odd, since I just finished " - "creating that file.\n", testFileName); - } - retValue =_getw( pfTest ); - i = 0; - while(retValue != EOF) - { - if(retValue != testArray[i]) - { - Cleanup(pfTest); - Fail ("Integers written by _putw are not in the correct format\n", - testFileName); - } - retValue = _getw( pfTest ); - i++ ; - } - - Cleanup(pfTest); - PAL_Terminate(); - return PASS; -} - - diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat deleted file mode 100644 index 3007b82407..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_putw/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _putw -Name = Positive test for _putw -TYPE = DEFAULT -EXE1 = test1 -Description -= Several integers are written to a new file using _putw. This file is -= closed, reopened and read from to verify the writes were successful. diff --git a/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt index bafaa23732..8aed25d776 100644 --- a/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_rotl/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rotl_test1 add_dependencies(paltest_rotl_test1 coreclrpal) target_link_libraries(paltest_rotl_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt index c0c76feb36..ff84c62fb1 100644 --- a/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_rotr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rotr_test1 add_dependencies(paltest_rotr_test1 coreclrpal) target_link_libraries(paltest_rotr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt index 9e4c671ec8..7ec4817f61 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test1 add_dependencies(paltest_snprintf_test1 coreclrpal) target_link_libraries(paltest_snprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt index 57e7fb16d3..8a61bc45e6 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test10 add_dependencies(paltest_snprintf_test10 coreclrpal) target_link_libraries(paltest_snprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt index 4fc179c5a8..5fe253463f 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test11 add_dependencies(paltest_snprintf_test11 coreclrpal) target_link_libraries(paltest_snprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt index a35609eb57..9eade54151 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test12 add_dependencies(paltest_snprintf_test12 coreclrpal) target_link_libraries(paltest_snprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt index 3bf986e851..1e31d2c94c 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test13 add_dependencies(paltest_snprintf_test13 coreclrpal) target_link_libraries(paltest_snprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt index 985303ecf8..1af6846df8 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test14 add_dependencies(paltest_snprintf_test14 coreclrpal) target_link_libraries(paltest_snprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt index c7f5796089..8287fd37d6 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test15 add_dependencies(paltest_snprintf_test15 coreclrpal) target_link_libraries(paltest_snprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt index 9a224bc23b..b45696e78d 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test16 add_dependencies(paltest_snprintf_test16 coreclrpal) target_link_libraries(paltest_snprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt index 3a8a349c84..60d34ebb4c 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test17 add_dependencies(paltest_snprintf_test17 coreclrpal) target_link_libraries(paltest_snprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt index 96e39e8f41..2bd5200e68 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test18 add_dependencies(paltest_snprintf_test18 coreclrpal) target_link_libraries(paltest_snprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt index be3570f163..1d9e283eb0 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test19 add_dependencies(paltest_snprintf_test19 coreclrpal) target_link_libraries(paltest_snprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt index 11d18e61c3..134aeaadd9 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test2 add_dependencies(paltest_snprintf_test2 coreclrpal) target_link_libraries(paltest_snprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp index e58669466f..54ef80bae3 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt index b8d4178962..198f725a0c 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test3 add_dependencies(paltest_snprintf_test3 coreclrpal) target_link_libraries(paltest_snprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp index 3c52b44246..99c25a654b 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test3/test3.cpp @@ -39,6 +39,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt index 568b7122de..81c3c1a0fe 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test4 add_dependencies(paltest_snprintf_test4 coreclrpal) target_link_libraries(paltest_snprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp index 216557f10a..7c0615213c 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test4/test4.cpp @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ - #if defined(BIT64) && defined(PLATFORM_UNIX) + #if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest("%p", NULL, "NULL", "0000000000000000"); DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); @@ -61,7 +61,7 @@ int __cdecl main(int argc, char *argv[]) DoPointerTest("%Lp", ptr, "pointer to 0x123456", "00123456"); DoI64Test("%I64p", lptr, "pointer to 0x1234567887654321", "1234567887654321"); - #endif //defined(BIT64) && defined(PLATFORM_UNIX) + #endif //defined(BIT64) PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt index 820cc66d55..08ead969f1 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test6 add_dependencies(paltest_snprintf_test6 coreclrpal) target_link_libraries(paltest_snprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt index a2af7c4a8c..71564eacf6 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test7 add_dependencies(paltest_snprintf_test7 coreclrpal) target_link_libraries(paltest_snprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt index 53545c5dbf..377883308b 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test8 add_dependencies(paltest_snprintf_test8 coreclrpal) target_link_libraries(paltest_snprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt index 33ca9db7a8..90a5403de7 100644 --- a/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snprintf_s/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snprintf_test9 add_dependencies(paltest_snprintf_test9 coreclrpal) target_link_libraries(paltest_snprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt index eac86f30e4..89496c562a 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test1 add_dependencies(paltest_snwprintf_test1 coreclrpal) target_link_libraries(paltest_snwprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt index 82ee739587..60703fa163 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test10 add_dependencies(paltest_snwprintf_test10 coreclrpal) target_link_libraries(paltest_snwprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt index f7d7845571..c305c62f31 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test11 add_dependencies(paltest_snwprintf_test11 coreclrpal) target_link_libraries(paltest_snwprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt index 5b926fb548..9532e67932 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test12 add_dependencies(paltest_snwprintf_test12 coreclrpal) target_link_libraries(paltest_snwprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt index 52a3c75a15..f1088003e7 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test13 add_dependencies(paltest_snwprintf_test13 coreclrpal) target_link_libraries(paltest_snwprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt index d557a30b42..79a04329ca 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test14 add_dependencies(paltest_snwprintf_test14 coreclrpal) target_link_libraries(paltest_snwprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt index 2e5ee362fc..c29ec7d925 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test15 add_dependencies(paltest_snwprintf_test15 coreclrpal) target_link_libraries(paltest_snwprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt index f4ce409dcb..d42726644a 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test16 add_dependencies(paltest_snwprintf_test16 coreclrpal) target_link_libraries(paltest_snwprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt index 159e15dafe..37fb79012c 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test17 add_dependencies(paltest_snwprintf_test17 coreclrpal) target_link_libraries(paltest_snwprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt index 5964e849a4..a880738a9c 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test18 add_dependencies(paltest_snwprintf_test18 coreclrpal) target_link_libraries(paltest_snwprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt index 5d84847ec1..cb16e1e15b 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test19 add_dependencies(paltest_snwprintf_test19 coreclrpal) target_link_libraries(paltest_snwprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt index ea33d48bd5..4307aa71c4 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test2 add_dependencies(paltest_snwprintf_test2 coreclrpal) target_link_libraries(paltest_snwprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp index 86bfdc9839..7d8dd65c38 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest(convert("foo %5.2s"), convert("bar"), convert("foo ba")); DoWStrTest(convert("foo %-5s"), convert("bar"), convert("foo bar ")); DoWStrTest(convert("foo %05s"), convert("bar"), convert("foo 00bar")); + DoWStrTest(convert("foo %s"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hs"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ws"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %Ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %I64s"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt index 5095b1a12e..c5278f4879 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test3 add_dependencies(paltest_snwprintf_test3 coreclrpal) target_link_libraries(paltest_snwprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp index f6db6f265d..b4a4a32ae2 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test3/test3.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest(convert("foo %5.2S"), "bar", convert("foo ba")); DoStrTest(convert("foo %-5S"), "bar", convert("foo bar ")); DoStrTest(convert("foo %05S"), "bar", convert("foo 00bar")); + DoStrTest(convert("foo %S"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %lS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %wS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %LS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %I64S"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt index 9cf81ea1bd..26229d719a 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test4 add_dependencies(paltest_snwprintf_test4 coreclrpal) target_link_libraries(paltest_snwprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp index 02d4781bd3..0819a7e659 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test4/test4.cpp @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest(convert("%p"), NULL, convert("0000000000000000")); DoPointerTest(convert("%p"), ptr, convert("0000000000123456")); diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt index 4996c7716f..542e943f89 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test6 add_dependencies(paltest_snwprintf_test6 coreclrpal) target_link_libraries(paltest_snwprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt index 0e55fbf4d7..0905c5d08b 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test7 add_dependencies(paltest_snwprintf_test7 coreclrpal) target_link_libraries(paltest_snwprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt index 8f7fbda5a0..a31a7f9f8f 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test8 add_dependencies(paltest_snwprintf_test8 coreclrpal) target_link_libraries(paltest_snwprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt index f769c9eaa5..90157fdd03 100644 --- a/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_snwprintf_s/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_snwprintf_test9 add_dependencies(paltest_snwprintf_test9 coreclrpal) target_link_libraries(paltest_snwprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt index 03aa3a523e..a0380a4404 100644 --- a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_stricmp_test1 add_dependencies(paltest_stricmp_test1 coreclrpal) target_link_libraries(paltest_stricmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt index ca26961b3c..bef0a7ed60 100644 --- a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strlwr_test1 add_dependencies(paltest_strlwr_test1 coreclrpal) target_link_libraries(paltest_strlwr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt index 03f9992198..2429339a6d 100644 --- a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strnicmp_test1 add_dependencies(paltest_strnicmp_test1 coreclrpal) target_link_libraries(paltest_strnicmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt deleted file mode 100644 index cafb9536b0..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -add_subdirectory(test1) -add_subdirectory(test10) -add_subdirectory(test11) -add_subdirectory(test12) -add_subdirectory(test13) -add_subdirectory(test14) -add_subdirectory(test15) -add_subdirectory(test16) -add_subdirectory(test17) -add_subdirectory(test18) -add_subdirectory(test19) -add_subdirectory(test2) -add_subdirectory(test3) -add_subdirectory(test4) -add_subdirectory(test5) -add_subdirectory(test6) -add_subdirectory(test7) -add_subdirectory(test8) -add_subdirectory(test9) - diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h b/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h deleted file mode 100644 index 30e70648c3..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h +++ /dev/null @@ -1,124 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================================ -** -** Source: _vsnprintf.h -** -** Purpose: Contains common testing functions for _vsnprintf -** -** -**==========================================================================*/ - -#ifndef __STRINGTEST_H__ -#define __STRINGTEST_H__ - -/* These functions leaks memory like crazy. C'est la vie. */ -int Testvsnprintf(char* buf, size_t count, const char* format, ...) -{ - int retVal; - va_list arglist; - - va_start(arglist, format); - retVal = _vsnprintf(buf, count, format, arglist); - va_end(arglist); - - return (retVal); -} - - -void DoStrTest(const char *formatstr, char* param, const char *checkstr) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf, 256, formatstr, param); - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: failed to insert string \"%s\" into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - param, formatstr, checkstr, buf); - } -} - -void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf, 256, formatstr, param); - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: failed to insert wide string \"%s\" into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - convertC(param), formatstr, checkstr, buf); - } -} - - -void DoCharTest(const char *formatstr, char param, const char *checkstr) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf, 256, formatstr, param); - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - param, param, formatstr, checkstr, buf); - } -} - -void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf, 256, formatstr, param); - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - (char)param, param, formatstr, checkstr, buf); - } -} - -void DoNumTest(const char *formatstr, int value, const char *checkstr) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf, 256, formatstr, value); - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: failed to insert %#x into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - value, formatstr, checkstr, buf); - } -} - -void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf, 256, formatstr, value); - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: failed to insert %s into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - valuestr, formatstr, checkstr, buf); - } -} -void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char - *checkstr2) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf,256, formatstr, value); - if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && - memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) - { - Fail("ERROR: failed to insert %f into \"%s\"\n" - "Expected \"%s\" or \"%s\", got \"%s\".\n", - value, formatstr, checkstr1, checkstr2, buf); - } -} - -#endif diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt deleted file mode 100644 index 489b7bf566..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test1.cpp -) - -add_executable(paltest_vsnprintf_test1 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test1 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test1 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp deleted file mode 100644 index 88aeec27a5..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test1.c -** -** Purpose: Test #1 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - char checkstr[] = "hello world"; - char buf[256] = { 0 }; - int ret; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - Testvsnprintf(buf, 256, "hello world"); - - if (memcmp(checkstr, buf, strlen(checkstr)+1) != 0) - { - Fail("ERROR: expected \"%s\" (up to %d chars), got \"%s\"\n", - checkstr, 256, buf); - } - - Testvsnprintf(buf, 256, "xxxxxxxxxxxxxxxxx"); - - ret = Testvsnprintf(buf, 8, "hello world"); - - if (ret >= 0) - { - Fail("ERROR: expected negative return value, got %d", ret); - } - if (memcmp(checkstr, buf, 8) != 0 || buf[8] != 'x') - { - Fail("ERROR: expected %s (up to %d chars), got %s\n", checkstr, 8, buf); - } - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat deleted file mode 100644 index f96bf084f2..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test1 -Description -= Tests the PAL implementation of the _vsnprintf function. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt deleted file mode 100644 index bc35dbd0c2..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test10.cpp -) - -add_executable(paltest_vsnprintf_test10 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test10 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test10 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp deleted file mode 100644 index 3099957ab7..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test10.c -** -** Purpose: Test #10 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - int neg = -42; - int pos = 42; - INT64 l = 42; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoNumTest("foo %o", pos, "foo 52"); - DoNumTest("foo %lo", 0xFFFF, "foo 177777"); - DoNumTest("foo %ho", 0xFFFF, "foo 177777"); - DoNumTest("foo %Lo", pos, "foo 52"); - DoI64Test("foo %I64o", l, "42", "foo 52"); - DoNumTest("foo %3o", pos, "foo 52"); - DoNumTest("foo %-3o", pos, "foo 52 "); - DoNumTest("foo %.1o", pos, "foo 52"); - DoNumTest("foo %.3o", pos, "foo 052"); - DoNumTest("foo %03o", pos, "foo 052"); - DoNumTest("foo %#o", pos, "foo 052"); - DoNumTest("foo %+o", pos, "foo 52"); - DoNumTest("foo % o", pos, "foo 52"); - DoNumTest("foo %+o", neg, "foo 37777777726"); - DoNumTest("foo % o", neg, "foo 37777777726"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat deleted file mode 100644 index a3d8eca54e..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test10 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with octal numbers. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt deleted file mode 100644 index bf3dd9a534..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test11.cpp -) - -add_executable(paltest_vsnprintf_test11 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test11 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test11 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp deleted file mode 100644 index 74b0435c6d..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test11.c -** -** Purpose: Test #11 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - int neg = -42; - int pos = 42; - INT64 l = 42; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoNumTest("foo %u", pos, "foo 42"); - DoNumTest("foo %lu", 0xFFFF, "foo 65535"); - DoNumTest("foo %hu", 0xFFFF, "foo 65535"); - DoNumTest("foo %Lu", pos, "foo 42"); - DoI64Test("foo %I64u", l, "42", "foo 42"); - DoNumTest("foo %3u", pos, "foo 42"); - DoNumTest("foo %-3u", pos, "foo 42 "); - DoNumTest("foo %.1u", pos, "foo 42"); - DoNumTest("foo %.3u", pos, "foo 042"); - DoNumTest("foo %03u", pos, "foo 042"); - DoNumTest("foo %#u", pos, "foo 42"); - DoNumTest("foo %+u", pos, "foo 42"); - DoNumTest("foo % u", pos, "foo 42"); - DoNumTest("foo %+u", neg, "foo 4294967254"); - DoNumTest("foo % u", neg, "foo 4294967254"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat deleted file mode 100644 index 17e9f04946..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test11 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with unsigned numbers. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt deleted file mode 100644 index 9fceeaf7a5..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test12.cpp -) - -add_executable(paltest_vsnprintf_test12 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test12 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test12 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp deleted file mode 100644 index 3718620971..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test12.c -** -** Purpose: Test #12 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - int neg = -42; - int pos = 0x1234ab; - INT64 l = I64(0x1234567887654321); - - if (PAL_Initialize(argc, argv) != 0) - { - return (FAIL); - } - - DoNumTest("foo %x", pos, "foo 1234ab"); - DoNumTest("foo %lx", pos, "foo 1234ab"); - DoNumTest("foo %hx", pos, "foo 34ab"); - DoNumTest("foo %Lx", pos, "foo 1234ab"); - DoI64Test("foo %I64x", l, "0x1234567887654321", - "foo 1234567887654321"); - DoNumTest("foo %7x", pos, "foo 1234ab"); - DoNumTest("foo %-7x", pos, "foo 1234ab "); - DoNumTest("foo %.1x", pos, "foo 1234ab"); - DoNumTest("foo %.7x", pos, "foo 01234ab"); - DoNumTest("foo %07x", pos, "foo 01234ab"); - DoNumTest("foo %#x", pos, "foo 0x1234ab"); - DoNumTest("foo %+x", pos, "foo 1234ab"); - DoNumTest("foo % x", pos, "foo 1234ab"); - DoNumTest("foo %+x", neg, "foo ffffffd6"); - DoNumTest("foo % x", neg, "foo ffffffd6"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat deleted file mode 100644 index 82f58e4371..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test12 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with hex numbers (lowercase). -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt deleted file mode 100644 index 7e805f6ad4..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test13.cpp -) - -add_executable(paltest_vsnprintf_test13 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test13 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test13 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp deleted file mode 100644 index 1abada4033..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test13.c -** -** Purpose: Test #13 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - int neg = -42; - int pos = 0x1234AB; - INT64 l = I64(0x1234567887654321); - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoNumTest("foo %X", pos, "foo 1234AB"); - DoNumTest("foo %lX", pos, "foo 1234AB"); - DoNumTest("foo %hX", pos, "foo 34AB"); - DoNumTest("foo %LX", pos, "foo 1234AB"); - DoI64Test("foo %I64X", l, "0x1234567887654321", - "foo 1234567887654321"); - DoNumTest("foo %7X", pos, "foo 1234AB"); - DoNumTest("foo %-7X", pos, "foo 1234AB "); - DoNumTest("foo %.1X", pos, "foo 1234AB"); - DoNumTest("foo %.7X", pos, "foo 01234AB"); - DoNumTest("foo %07X", pos, "foo 01234AB"); - DoNumTest("foo %#X", pos, "foo 0X1234AB"); - DoNumTest("foo %+X", pos, "foo 1234AB"); - DoNumTest("foo % X", pos, "foo 1234AB"); - DoNumTest("foo %+X", neg, "foo FFFFFFD6"); - DoNumTest("foo % X", neg, "foo FFFFFFD6"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat deleted file mode 100644 index d308edf871..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test13 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with hex numbers (uppercase). -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt deleted file mode 100644 index 6e4566b577..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test14.cpp -) - -add_executable(paltest_vsnprintf_test14 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test14 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test14 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp deleted file mode 100644 index 2e98f6ad4e..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test14.c -** -** Purpose: Test #14 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - double val = 256.0; - double neg = -256.0; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoDoubleTest("foo %e", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %le", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %he", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %Le", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %I64e", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %14e", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %-14e", val, "foo 2.560000e+002 ", "foo 2.560000e+02 "); - DoDoubleTest("foo %.1e", val, "foo 2.6e+002", "foo 2.6e+02"); - DoDoubleTest("foo %.8e", val, "foo 2.56000000e+002", "foo 2.56000000e+02"); - DoDoubleTest("foo %014e", val, "foo 02.560000e+002", "foo 002.560000e+02"); - DoDoubleTest("foo %#e", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %+e", val, "foo +2.560000e+002", "foo +2.560000e+02"); - DoDoubleTest("foo % e", val, "foo 2.560000e+002", "foo 2.560000e+02"); - DoDoubleTest("foo %+e", neg, "foo -2.560000e+002", "foo -2.560000e+02"); - DoDoubleTest("foo % e", neg, "foo -2.560000e+002", "foo -2.560000e+02"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat deleted file mode 100644 index 8d11b1d6ff..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test14 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with exponential format doubles (lowercase). -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt deleted file mode 100644 index d9039b39b7..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test15.cpp -) - -add_executable(paltest_vsnprintf_test15 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test15 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test15 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp deleted file mode 100644 index 4d32e9c638..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test15.c -** -** Purpose: Test #15 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - double val = 256.0; - double neg = -256.0; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoDoubleTest("foo %E", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %lE", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %hE", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %LE", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %I64E", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %14E", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %-14E", val, "foo 2.560000E+002 ", "foo 2.560000E+02 "); - DoDoubleTest("foo %.1E", val, "foo 2.6E+002", "foo 2.6E+02"); - DoDoubleTest("foo %.8E", val, "foo 2.56000000E+002", "foo 2.56000000E+02"); - DoDoubleTest("foo %014E", val, "foo 02.560000E+002", "foo 002.560000E+02"); - DoDoubleTest("foo %#E", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %+E", val, "foo +2.560000E+002", "foo +2.560000E+02"); - DoDoubleTest("foo % E", val, "foo 2.560000E+002", "foo 2.560000E+02"); - DoDoubleTest("foo %+E", neg, "foo -2.560000E+002", "foo -2.560000E+02"); - DoDoubleTest("foo % E", neg, "foo -2.560000E+002", "foo -2.560000E+02"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat deleted file mode 100644 index 913912508e..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test15 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with exponential format doubles (uppercase). -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt deleted file mode 100644 index b298df318b..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test16.cpp -) - -add_executable(paltest_vsnprintf_test16 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test16 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test16 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp deleted file mode 100644 index 118ba1453c..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test16.c -** -** Purpose: Test #16 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - double val = 2560.001; - double neg = -2560.001; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoDoubleTest("foo %f", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %lf", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %hf", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %Lf", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %I64f", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %12f", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %-12f", val, "foo 2560.001000 ", "foo 2560.001000 "); - DoDoubleTest("foo %.1f", val, "foo 2560.0", "foo 2560.0"); - DoDoubleTest("foo %.8f", val, "foo 2560.00100000", "foo 2560.00100000"); - DoDoubleTest("foo %012f", val, "foo 02560.001000", "foo 02560.001000"); - DoDoubleTest("foo %#f", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %+f", val, "foo +2560.001000", "foo +2560.001000"); - DoDoubleTest("foo % f", val, "foo 2560.001000", "foo 2560.001000"); - DoDoubleTest("foo %+f", neg, "foo -2560.001000", "foo -2560.001000"); - DoDoubleTest("foo % f", neg, "foo -2560.001000", "foo -2560.001000"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat deleted file mode 100644 index fc2f13071b..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test16 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with decimal point format doubles. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt deleted file mode 100644 index b195f334d3..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test17.cpp -) - -add_executable(paltest_vsnprintf_test17 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test17 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test17 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp deleted file mode 100644 index 9b5063ddf0..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test17.c -** -** Purpose: Test #17 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - double val = 2560.001; - double neg = -2560.001; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoDoubleTest("foo %g", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %lg", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %hg", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %Lg", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %I64g", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %5g", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %-5g", val, "foo 2560 ", "foo 2560 "); - DoDoubleTest("foo %.1g", val, "foo 3e+003", "foo 3e+03"); - DoDoubleTest("foo %.2g", val, "foo 2.6e+003", "foo 2.6e+03"); - DoDoubleTest("foo %.12g", val, "foo 2560.001", "foo 2560.001"); - DoDoubleTest("foo %06g", val, "foo 002560", "foo 002560"); - DoDoubleTest("foo %#g", val, "foo 2560.00", "foo 2560.00"); - DoDoubleTest("foo %+g", val, "foo +2560", "foo +2560"); - DoDoubleTest("foo % g", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %+g", neg, "foo -2560", "foo -2560"); - DoDoubleTest("foo % g", neg, "foo -2560", "foo -2560"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat deleted file mode 100644 index aeb924495c..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test17 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with compact format doubles (lowercase). -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt deleted file mode 100644 index f0f6d1124e..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test18.cpp -) - -add_executable(paltest_vsnprintf_test18 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test18 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test18 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp deleted file mode 100644 index 5232befc7f..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test18.c -** -** Purpose: Test #18 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - double val = 2560.001; - double neg = -2560.001; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoDoubleTest("foo %G", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %lG", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %hG", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %LG", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %I64G", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %5G", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %-5G", val, "foo 2560 ", "foo 2560 "); - DoDoubleTest("foo %.1G", val, "foo 3E+003", "foo 3E+03"); - DoDoubleTest("foo %.2G", val, "foo 2.6E+003", "foo 2.6E+03"); - DoDoubleTest("foo %.12G", val, "foo 2560.001", "foo 2560.001"); - DoDoubleTest("foo %06G", val, "foo 002560", "foo 002560"); - DoDoubleTest("foo %#G", val, "foo 2560.00", "foo 2560.00"); - DoDoubleTest("foo %+G", val, "foo +2560", "foo +2560"); - DoDoubleTest("foo % G", val, "foo 2560", "foo 2560"); - DoDoubleTest("foo %+G", neg, "foo -2560", "foo -2560"); - DoDoubleTest("foo % G", neg, "foo -2560", "foo -2560"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat deleted file mode 100644 index 57aaed5953..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test18 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with compact format doubles (uppercase). -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt deleted file mode 100644 index 44b38902ef..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test19.cpp -) - -add_executable(paltest_vsnprintf_test19 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test19 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test19 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp deleted file mode 100644 index 211354bc3a..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp +++ /dev/null @@ -1,103 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test19.c -** -** Purpose: Test #19 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -#define DOTEST(a,b,c,d,e) DoTest(a,b,(void*)c,d,e) - -void DoArgumentPrecTest(char *formatstr, int precision, void *param, - char *paramstr, char *checkstr1, char *checkstr2) -{ - char buf[256]; - - Testvsnprintf(buf,256,formatstr, precision, param); - if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && - memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) - { - Fail("ERROR: failed to insert %s into \"%s\" with precision %d\n" - "Expected \"%s\" or \"%s\", got \"%s\".\n", - paramstr, formatstr, precision, checkstr1, checkstr2, buf); - } - -} - -void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, - char *checkstr1, char *checkstr2) -{ - char buf[256]; - - Testvsnprintf(buf,256,formatstr, precision, param); - if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && - memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) - { - Fail("ERROR: failed to insert %f into \"%s\" with precision %d\n" - "Expected \"%s\" or \"%s\", got \"%s\".\n", - param, formatstr, precision, checkstr1, checkstr2, buf); - } - -} - - - -int __cdecl main(int argc, char *argv[]) -{ - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - - DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba"); - DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba"); - DoArgumentPrecTest("%.*c", 0, (void*)'a', "a", "a", "a"); - DoArgumentPrecTest("%.*c", 4, (void*)'a', "a", "a", "a"); - DoArgumentPrecTest("%.*C", 0, (void*)'a', "a", "a", "a"); - DoArgumentPrecTest("%.*C", 4, (void*)'a', "a", "a", "a"); - DoArgumentPrecTest("%.*d", 1, (void*)42, "42", "42", "42"); - DoArgumentPrecTest("%.*d", 3, (void*)42, "42", "042", "042"); - DoArgumentPrecTest("%.*i", 1, (void*)42, "42", "42", "42"); - DoArgumentPrecTest("%.*i", 3, (void*)42, "42", "042", "042"); - DoArgumentPrecTest("%.*o", 1, (void*)42, "42", "52", "52"); - DoArgumentPrecTest("%.*o", 3, (void*)42, "42", "052", "052"); - DoArgumentPrecTest("%.*u", 1, (void*)42, "42", "42", "42"); - DoArgumentPrecTest("%.*u", 3, (void*)42, "42", "042", "042"); - DoArgumentPrecTest("%.*x", 1, (void*)0x42, "0x42", "42", "42"); - DoArgumentPrecTest("%.*x", 3, (void*)0x42, "0x42", "042", "042"); - DoArgumentPrecTest("%.*X", 1, (void*)0x42, "0x42", "42", "42"); - DoArgumentPrecTest("%.*X", 3, (void*)0x42, "0x42", "042", "042"); - - - DoArgumentPrecDoubleTest("%.*e", 1, 2.01, "2.0e+000", "2.0e+00"); - DoArgumentPrecDoubleTest("%.*e", 3, 2.01, "2.010e+000", "2.010e+00"); - DoArgumentPrecDoubleTest("%.*E", 1, 2.01, "2.0E+000", "2.0E+00"); - DoArgumentPrecDoubleTest("%.*E", 3, 2.01, "2.010E+000", "2.010E+00"); - DoArgumentPrecDoubleTest("%.*f", 1, 2.01, "2.0", "2.0"); - DoArgumentPrecDoubleTest("%.*f", 3, 2.01, "2.010", "2.010"); - DoArgumentPrecDoubleTest("%.*g", 1, 256.01, "3e+002", "3e+02"); - DoArgumentPrecDoubleTest("%.*g", 3, 256.01, "256", "256"); - DoArgumentPrecDoubleTest("%.*g", 4, 256.01, "256", "256"); - DoArgumentPrecDoubleTest("%.*g", 6, 256.01, "256.01", "256.01"); - DoArgumentPrecDoubleTest("%.*G", 1, 256.01, "3E+002", "3E+02"); - DoArgumentPrecDoubleTest("%.*G", 3, 256.01, "256", "256"); - DoArgumentPrecDoubleTest("%.*G", 4, 256.01, "256", "256"); - DoArgumentPrecDoubleTest("%.*G", 6, 256.01, "256.01", "256.01"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat deleted file mode 100644 index cda8966865..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test19 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with argument specified precision. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt deleted file mode 100644 index 1d3910e70c..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test2.cpp -) - -add_executable(paltest_vsnprintf_test2 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test2 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test2 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp deleted file mode 100644 index 4bac4d2c83..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test2.c -** -** Purpose: Test #2 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - WCHAR szwStr[] = {'b','a','r','\0'}; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoStrTest("foo %s", "bar", "foo bar"); - DoStrTest("foo %hs", "bar", "foo bar"); - DoWStrTest("foo %ls", szwStr, "foo bar"); - DoWStrTest("foo %ws", szwStr, "foo bar"); - DoStrTest("foo %Ls", "bar", "foo bar"); - DoStrTest("foo %I64s", "bar", "foo bar"); - DoStrTest("foo %5s", "bar", "foo bar"); - DoStrTest("foo %.2s", "bar", "foo ba"); - DoStrTest("foo %5.2s", "bar", "foo ba"); - DoStrTest("foo %-5s", "bar", "foo bar "); - DoStrTest("foo %05s", "bar", "foo 00bar"); - - PAL_Terminate(); - return PASS; -} - diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat deleted file mode 100644 index 6e8f03e639..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test2 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with strings. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt deleted file mode 100644 index 62d765ec5f..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test3.cpp -) - -add_executable(paltest_vsnprintf_test3 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test3 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test3 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp deleted file mode 100644 index 2b30c9ad99..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test3.c -** -** Purpose: Test #3 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoWStrTest("foo %S", convert("bar"), "foo bar"); - DoStrTest("foo %hS", "bar", "foo bar"); - DoWStrTest("foo %lS", convert("bar"), "foo bar"); - DoWStrTest("foo %wS", convert("bar"), "foo bar"); - DoWStrTest("foo %LS", convert("bar"), "foo bar"); - DoWStrTest("foo %I64S", convert("bar"), "foo bar"); - DoWStrTest("foo %5S", convert("bar"), "foo bar"); - DoWStrTest("foo %.2S", convert("bar"), "foo ba"); - DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); - DoWStrTest("foo %-5S", convert("bar"), "foo bar "); - DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat deleted file mode 100644 index 638cef69ef..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test3 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with wide strings. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt deleted file mode 100644 index 5662bd57ad..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test4.cpp -) - -add_executable(paltest_vsnprintf_test4 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test4 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test4 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp deleted file mode 100644 index 33fc49deba..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test4.c -** -** Purpose: Test #4 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -static void DoPointerTest(char *formatstr, void* param, char* paramstr, - char *checkstr1) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf,256, formatstr, param); - if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0) - { - Fail("ERROR: failed to insert %s into \"%s\"\n" - "Expected \"%s\" got \"%s\".\n", - paramstr, formatstr, checkstr1, buf); - } -} - -static void DoI64DoubleTest(char *formatstr, INT64 value, char *valuestr, char -*checkstr1) -{ - char buf[256] = { 0 }; - - Testvsnprintf(buf,256,formatstr, value); - if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0) - { - Fail("ERROR: failed to insert %s into \"%s\"\n" - "Expected \"%s\", got \"%s\".\n", - valuestr, formatstr, checkstr1, buf); - } -} - -int __cdecl main(int argc, char *argv[]) -{ - void *ptr = (void*) 0x123456; - INT64 lptr = I64(0x1234567887654321); - - if (PAL_Initialize(argc, argv) != 0) - return(FAIL); - - - /* -** Run only on 64 bit platforms -*/ -#if defined(BIT64) && defined(PLATFORM_UNIX) - Trace("Testing for 64 Bit Platforms \n"); - DoPointerTest("%p", NULL, "NULL", "0000000000000000"); - DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); - DoPointerTest("%17p", ptr, "pointer to 0x123456", " 0000000000123456"); - DoPointerTest("%17p", ptr, "pointer to 0x123456", " 0000000000123456"); - DoPointerTest("%-17p", ptr, "pointer to 0x123456", "0000000000123456 "); - DoPointerTest("%+p", ptr, "pointer to 0x123456", "0000000000123456"); - DoPointerTest("%#p", ptr, "pointer to 0x123456", "0X0000000000123456"); - DoPointerTest("%lp", ptr, "pointer to 0x123456", "00123456"); - DoPointerTest("%hp", ptr, "pointer to 0x123456", "00003456"); - DoPointerTest("%Lp", ptr, "pointer to 0x123456", "00123456"); - DoI64DoubleTest("%I64p", lptr, "pointer to 0x1234567887654321", - "1234567887654321"); - -#else - Trace("Testing for Non 64 Bit Platforms \n"); - DoPointerTest("%p", NULL, "NULL", "00000000"); - DoPointerTest("%p", ptr, "pointer to 0x123456", "00123456"); - DoPointerTest("%9p", ptr, "pointer to 0x123456", " 00123456"); - DoPointerTest("%09p", ptr, "pointer to 0x123456", " 00123456"); - DoPointerTest("%-9p", ptr, "pointer to 0x123456", "00123456 "); - DoPointerTest("%+p", ptr, "pointer to 0x123456", "00123456"); - DoPointerTest("%#p", ptr, "pointer to 0x123456", "0X00123456"); - DoPointerTest("%lp", ptr, "pointer to 0x123456", "00123456"); - DoPointerTest("%hp", ptr, "pointer to 0x123456", "00003456"); - DoPointerTest("%Lp", ptr, "pointer to 0x123456", "00123456"); - DoI64DoubleTest("%I64p", lptr, "pointer to 0x1234567887654321", - "1234567887654321"); -#endif - - - - - PAL_Terminate(); - return PASS; -} - diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat deleted file mode 100644 index 03ff2931bc..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test4 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with pointers. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt deleted file mode 100644 index 92540541f3..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test5.cpp -) - -add_executable(paltest_vsnprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test5 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test5 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp deleted file mode 100644 index 534e42e293..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test5.c -** -** Purpose: Test #5 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -static void DoTest(char *formatstr, int param, char *checkstr) -{ - char buf[256] = { 0 }; - int n = -1; - - Testvsnprintf(buf, 256, formatstr, &n); - - if (n != param) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %X\n", - param, n); - } - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); - } -} - -static void DoShortTest(char *formatstr, int param, char *checkstr) -{ - char buf[256] = { 0 }; - short int n = -1; - - Testvsnprintf(buf, 256, formatstr, &n); - - if (n != param) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %X\n", - param, n); - } - if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) - { - Fail("ERROR: Expected \"%s\" got \"%s\".\n", checkstr, buf); - } -} - -int __cdecl main(int argc, char *argv[]) -{ - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoTest("foo %n bar", 4, "foo bar"); - DoTest("foo %#n bar", 4, "foo bar"); - DoTest("foo % n bar", 4, "foo bar"); - DoTest("foo %+n bar", 4, "foo bar"); - DoTest("foo %-n bar", 4, "foo bar"); - DoTest("foo %0n bar", 4, "foo bar"); - DoShortTest("foo %hn bar", 4, "foo bar"); - DoTest("foo %ln bar", 4, "foo bar"); - DoTest("foo %Ln bar", 4, "foo bar"); - DoTest("foo %I64n bar", 4, "foo bar"); - DoTest("foo %20.3n bar", 4, "foo bar"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat deleted file mode 100644 index c3848824f1..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with the count specifier. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt deleted file mode 100644 index d80d433c22..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test6.cpp -) - -add_executable(paltest_vsnprintf_test6 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test6 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test6 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp deleted file mode 100644 index 103d1181c2..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test6.c -** -** Purpose: Test #6 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - -int __cdecl main(int argc, char *argv[]) -{ - WCHAR wc = (WCHAR) 'c'; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoCharTest("foo %c", 'b', "foo b"); - DoCharTest("foo %hc", 'b', "foo b"); - DoWCharTest("foo %lc", wc, "foo c"); - DoCharTest("foo %Lc", 'b', "foo b"); - DoCharTest("foo %I64c", 'b', "foo b"); - DoCharTest("foo %5c", 'b', "foo b"); - DoCharTest("foo %.0c", 'b', "foo b"); - DoCharTest("foo %-5c", 'b', "foo b "); - DoCharTest("foo %05c", 'b', "foo 0000b"); - DoCharTest("foo % c", 'b', "foo b"); - DoCharTest("foo %#c", 'b', "foo b"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat deleted file mode 100644 index e375f9238d..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test6 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with characters. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt deleted file mode 100644 index a1dc0a7c2c..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test7.cpp -) - -add_executable(paltest_vsnprintf_test7 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test7 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test7 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp deleted file mode 100644 index c7e45d67fa..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test7.c -** -** Purpose: Test #7 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - WCHAR wb = (WCHAR) 'b'; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoWCharTest("foo %c", wb, "foo b"); - DoWCharTest("foo %hc", wb, "foo b"); - DoCharTest("foo %lc", 'c', "foo c"); - DoWCharTest("foo %Lc", wb, "foo b"); - DoWCharTest("foo %I64c", wb, "foo b"); - DoWCharTest("foo %5c", wb, "foo b"); - DoWCharTest("foo %.0c", wb, "foo b"); - DoWCharTest("foo %-5c", wb, "foo b "); - DoWCharTest("foo %05c", wb, "foo 0000b"); - DoWCharTest("foo % c", wb, "foo b"); - DoWCharTest("foo %#c", wb, "foo b"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat deleted file mode 100644 index 09eb481b59..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test7 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with wide characters. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt deleted file mode 100644 index 1ca4732492..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test8.cpp -) - -add_executable(paltest_vsnprintf_test8 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test8 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test8 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp deleted file mode 100644 index 2cefbeac25..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test8.c -** -** Purpose: Test #8 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - int neg = -42; - int pos = 42; - INT64 l = 42; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoNumTest("foo %d", pos, "foo 42"); - DoNumTest("foo %ld", 0xFFFF, "foo 65535"); - DoNumTest("foo %hd", 0xFFFF, "foo -1"); - DoNumTest("foo %Ld", pos, "foo 42"); - DoI64Test("foo %I64d", l, "42", "foo 42"); - DoNumTest("foo %3d", pos, "foo 42"); - DoNumTest("foo %-3d", pos, "foo 42 "); - DoNumTest("foo %.1d", pos, "foo 42"); - DoNumTest("foo %.3d", pos, "foo 042"); - DoNumTest("foo %03d", pos, "foo 042"); - DoNumTest("foo %#d", pos, "foo 42"); - DoNumTest("foo %+d", pos, "foo +42"); - DoNumTest("foo % d", pos, "foo 42"); - DoNumTest("foo %+d", neg, "foo -42"); - DoNumTest("foo % d", neg, "foo -42"); - - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat deleted file mode 100644 index 1bdf411983..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test8 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with decimal numbers. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt deleted file mode 100644 index 583971fe5a..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test9.cpp -) - -add_executable(paltest_vsnprintf_test9 - ${SOURCES} -) - -add_dependencies(paltest_vsnprintf_test9 coreclrpal) - -target_link_libraries(paltest_vsnprintf_test9 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp deleted file mode 100644 index d2cd8165c0..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test9.c -** -** Purpose: Test #9 for the _vsnprintf function. -** -** -**===================================================================*/ - -#include -#include "../_vsnprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - int neg = -42; - int pos = 42; - INT64 l = 42; - - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoNumTest("foo %i", pos, "foo 42"); - DoNumTest("foo %li", 0xFFFF, "foo 65535"); - DoNumTest("foo %hi", 0xFFFF, "foo -1"); - DoNumTest("foo %Li", pos, "foo 42"); - DoI64Test("foo %I64i", l, "42", "foo 42"); - DoNumTest("foo %3i", pos, "foo 42"); - DoNumTest("foo %-3i", pos, "foo 42 "); - DoNumTest("foo %.1i", pos, "foo 42"); - DoNumTest("foo %.3i", pos, "foo 042"); - DoNumTest("foo %03i", pos, "foo 042"); - DoNumTest("foo %#i", pos, "foo 42"); - DoNumTest("foo %+i", pos, "foo +42"); - DoNumTest("foo % i", pos, "foo 42"); - DoNumTest("foo %+i", neg, "foo -42"); - DoNumTest("foo % i", neg, "foo -42"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat deleted file mode 100644 index bdaae87ce8..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = _vsnprintf -Name = Positive Test for _vsnprintf -TYPE = DEFAULT -EXE1 = test9 -Description -= Tests the PAL implementation of the _vsnprintf function. -= Tests _vsnprintf with integer numbers. -= This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt new file mode 100644 index 0000000000..8fe1cb60ac --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +add_subdirectory(test1) +add_subdirectory(test10) +add_subdirectory(test11) +add_subdirectory(test12) +add_subdirectory(test13) +add_subdirectory(test14) +add_subdirectory(test15) +add_subdirectory(test16) +add_subdirectory(test17) +add_subdirectory(test18) +add_subdirectory(test19) +add_subdirectory(test2) +add_subdirectory(test3) +add_subdirectory(test4) +add_subdirectory(test6) +add_subdirectory(test7) +add_subdirectory(test8) +add_subdirectory(test9) + diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h new file mode 100644 index 0000000000..7c81136f71 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h @@ -0,0 +1,124 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*============================================================================ +** +** Source: _vsnprintf_s.h +** +** Purpose: Contains common testing functions for _vsnprintf +** +** +**==========================================================================*/ + +#ifndef __STRINGTEST_H__ +#define __STRINGTEST_H__ + +/* These functions leaks memory like crazy. C'est la vie. */ +int Testvsnprintf(char* buf, size_t count, const char* format, ...) +{ + int retVal; + va_list arglist; + + va_start(arglist, format); + retVal = _vsnprintf_s(buf, count, _TRUNCATE, format, arglist); + va_end(arglist); + + return (retVal); +} + + +void DoStrTest(const char *formatstr, char* param, const char *checkstr) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf, 256, formatstr, param); + if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) + { + Fail("ERROR: failed to insert string \"%s\" into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + param, formatstr, checkstr, buf); + } +} + +void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf, 256, formatstr, param); + if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) + { + Fail("ERROR: failed to insert wide string \"%s\" into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + convertC(param), formatstr, checkstr, buf); + } +} + + +void DoCharTest(const char *formatstr, char param, const char *checkstr) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf, 256, formatstr, param); + if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) + { + Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + param, param, formatstr, checkstr, buf); + } +} + +void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf, 256, formatstr, param); + if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) + { + Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + (char)param, param, formatstr, checkstr, buf); + } +} + +void DoNumTest(const char *formatstr, int value, const char *checkstr) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf, 256, formatstr, value); + if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) + { + Fail("ERROR: failed to insert %#x into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + value, formatstr, checkstr, buf); + } +} + +void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf, 256, formatstr, value); + if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) + { + Fail("ERROR: failed to insert %s into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + valuestr, formatstr, checkstr, buf); + } +} +void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char + *checkstr2) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf,256, formatstr, value); + if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && + memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) + { + Fail("ERROR: failed to insert %f into \"%s\"\n" + "Expected \"%s\" or \"%s\", got \"%s\".\n", + value, formatstr, checkstr1, checkstr2, buf); + } +} + +#endif diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt new file mode 100644 index 0000000000..ee97f2bf16 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test1.cpp +) + +add_executable(paltest_vsnprintf_test1 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test1 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test1 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp new file mode 100644 index 0000000000..db70f5612b --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp @@ -0,0 +1,55 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test1.c +** +** Purpose: Test #1 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + char checkstr[] = "hello world"; + char buf[256] = { 0 }; + int ret; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + Testvsnprintf(buf, 256, "hello world"); + + if (memcmp(checkstr, buf, strlen(checkstr)+1) != 0) + { + Fail("ERROR: expected \"%s\" (up to %d chars), got \"%s\"\n", + checkstr, 256, buf); + } + + Testvsnprintf(buf, 256, "xxxxxxxxxxxxxxxxx"); + + ret = Testvsnprintf(buf, 8, "hello world"); + + if (ret >= 0) + { + Fail("ERROR: expected negative return value, got %d", ret); + } + if (memcmp(checkstr, buf, 7) != 0 || buf[7] != 0) + { + Fail("ERROR: expected %s (up to %d chars), got %s\n", checkstr, 8, buf); + } + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat new file mode 100644 index 0000000000..f96bf084f2 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat @@ -0,0 +1,13 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test1 +Description += Tests the PAL implementation of the _vsnprintf function. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt new file mode 100644 index 0000000000..ad067ccd7d --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test10.cpp +) + +add_executable(paltest_vsnprintf_test10 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test10 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test10 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp new file mode 100644 index 0000000000..707a91c048 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp @@ -0,0 +1,50 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test10.c +** +** Purpose: Test #10 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + int neg = -42; + int pos = 42; + INT64 l = 42; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoNumTest("foo %o", pos, "foo 52"); + DoNumTest("foo %lo", 0xFFFF, "foo 177777"); + DoNumTest("foo %ho", 0xFFFF, "foo 177777"); + DoNumTest("foo %Lo", pos, "foo 52"); + DoI64Test("foo %I64o", l, "42", "foo 52"); + DoNumTest("foo %3o", pos, "foo 52"); + DoNumTest("foo %-3o", pos, "foo 52 "); + DoNumTest("foo %.1o", pos, "foo 52"); + DoNumTest("foo %.3o", pos, "foo 052"); + DoNumTest("foo %03o", pos, "foo 052"); + DoNumTest("foo %#o", pos, "foo 052"); + DoNumTest("foo %+o", pos, "foo 52"); + DoNumTest("foo % o", pos, "foo 52"); + DoNumTest("foo %+o", neg, "foo 37777777726"); + DoNumTest("foo % o", neg, "foo 37777777726"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat new file mode 100644 index 0000000000..a3d8eca54e --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test10 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with octal numbers. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt new file mode 100644 index 0000000000..9fb2b903de --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test11.cpp +) + +add_executable(paltest_vsnprintf_test11 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test11 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test11 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp new file mode 100644 index 0000000000..4c710e56b0 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp @@ -0,0 +1,50 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test11.c +** +** Purpose: Test #11 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + int neg = -42; + int pos = 42; + INT64 l = 42; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoNumTest("foo %u", pos, "foo 42"); + DoNumTest("foo %lu", 0xFFFF, "foo 65535"); + DoNumTest("foo %hu", 0xFFFF, "foo 65535"); + DoNumTest("foo %Lu", pos, "foo 42"); + DoI64Test("foo %I64u", l, "42", "foo 42"); + DoNumTest("foo %3u", pos, "foo 42"); + DoNumTest("foo %-3u", pos, "foo 42 "); + DoNumTest("foo %.1u", pos, "foo 42"); + DoNumTest("foo %.3u", pos, "foo 042"); + DoNumTest("foo %03u", pos, "foo 042"); + DoNumTest("foo %#u", pos, "foo 42"); + DoNumTest("foo %+u", pos, "foo 42"); + DoNumTest("foo % u", pos, "foo 42"); + DoNumTest("foo %+u", neg, "foo 4294967254"); + DoNumTest("foo % u", neg, "foo 4294967254"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat new file mode 100644 index 0000000000..17e9f04946 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test11 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with unsigned numbers. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt new file mode 100644 index 0000000000..f78711cfdf --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test12.cpp +) + +add_executable(paltest_vsnprintf_test12 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test12 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test12 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp new file mode 100644 index 0000000000..528e6582a8 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test12.c +** +** Purpose: Test #12 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + + +int __cdecl main(int argc, char *argv[]) +{ + int neg = -42; + int pos = 0x1234ab; + INT64 l = I64(0x1234567887654321); + + if (PAL_Initialize(argc, argv) != 0) + { + return (FAIL); + } + + DoNumTest("foo %x", pos, "foo 1234ab"); + DoNumTest("foo %lx", pos, "foo 1234ab"); + DoNumTest("foo %hx", pos, "foo 34ab"); + DoNumTest("foo %Lx", pos, "foo 1234ab"); + DoI64Test("foo %I64x", l, "0x1234567887654321", + "foo 1234567887654321"); + DoNumTest("foo %7x", pos, "foo 1234ab"); + DoNumTest("foo %-7x", pos, "foo 1234ab "); + DoNumTest("foo %.1x", pos, "foo 1234ab"); + DoNumTest("foo %.7x", pos, "foo 01234ab"); + DoNumTest("foo %07x", pos, "foo 01234ab"); + DoNumTest("foo %#x", pos, "foo 0x1234ab"); + DoNumTest("foo %+x", pos, "foo 1234ab"); + DoNumTest("foo % x", pos, "foo 1234ab"); + DoNumTest("foo %+x", neg, "foo ffffffd6"); + DoNumTest("foo % x", neg, "foo ffffffd6"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat new file mode 100644 index 0000000000..82f58e4371 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test12 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with hex numbers (lowercase). += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt new file mode 100644 index 0000000000..b37300c6d7 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test13.cpp +) + +add_executable(paltest_vsnprintf_test13 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test13 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test13 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp new file mode 100644 index 0000000000..645a118682 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test13.c +** +** Purpose: Test #13 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + + +int __cdecl main(int argc, char *argv[]) +{ + int neg = -42; + int pos = 0x1234AB; + INT64 l = I64(0x1234567887654321); + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoNumTest("foo %X", pos, "foo 1234AB"); + DoNumTest("foo %lX", pos, "foo 1234AB"); + DoNumTest("foo %hX", pos, "foo 34AB"); + DoNumTest("foo %LX", pos, "foo 1234AB"); + DoI64Test("foo %I64X", l, "0x1234567887654321", + "foo 1234567887654321"); + DoNumTest("foo %7X", pos, "foo 1234AB"); + DoNumTest("foo %-7X", pos, "foo 1234AB "); + DoNumTest("foo %.1X", pos, "foo 1234AB"); + DoNumTest("foo %.7X", pos, "foo 01234AB"); + DoNumTest("foo %07X", pos, "foo 01234AB"); + DoNumTest("foo %#X", pos, "foo 0X1234AB"); + DoNumTest("foo %+X", pos, "foo 1234AB"); + DoNumTest("foo % X", pos, "foo 1234AB"); + DoNumTest("foo %+X", neg, "foo FFFFFFD6"); + DoNumTest("foo % X", neg, "foo FFFFFFD6"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat new file mode 100644 index 0000000000..d308edf871 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test13 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with hex numbers (uppercase). += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt new file mode 100644 index 0000000000..97098d48c7 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test14.cpp +) + +add_executable(paltest_vsnprintf_test14 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test14 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test14 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp new file mode 100644 index 0000000000..05965f0ed7 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp @@ -0,0 +1,50 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test14.c +** +** Purpose: Test #14 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + + +int __cdecl main(int argc, char *argv[]) +{ + double val = 256.0; + double neg = -256.0; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoDoubleTest("foo %e", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %le", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %he", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %Le", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %I64e", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %14e", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %-14e", val, "foo 2.560000e+002 ", "foo 2.560000e+02 "); + DoDoubleTest("foo %.1e", val, "foo 2.6e+002", "foo 2.6e+02"); + DoDoubleTest("foo %.8e", val, "foo 2.56000000e+002", "foo 2.56000000e+02"); + DoDoubleTest("foo %014e", val, "foo 02.560000e+002", "foo 002.560000e+02"); + DoDoubleTest("foo %#e", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %+e", val, "foo +2.560000e+002", "foo +2.560000e+02"); + DoDoubleTest("foo % e", val, "foo 2.560000e+002", "foo 2.560000e+02"); + DoDoubleTest("foo %+e", neg, "foo -2.560000e+002", "foo -2.560000e+02"); + DoDoubleTest("foo % e", neg, "foo -2.560000e+002", "foo -2.560000e+02"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat new file mode 100644 index 0000000000..8d11b1d6ff --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test14 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with exponential format doubles (lowercase). += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt new file mode 100644 index 0000000000..95e5a475f9 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test15.cpp +) + +add_executable(paltest_vsnprintf_test15 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test15 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test15 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp new file mode 100644 index 0000000000..cd34f74e6c --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp @@ -0,0 +1,49 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test15.c +** +** Purpose: Test #15 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + double val = 256.0; + double neg = -256.0; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoDoubleTest("foo %E", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %lE", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %hE", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %LE", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %I64E", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %14E", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %-14E", val, "foo 2.560000E+002 ", "foo 2.560000E+02 "); + DoDoubleTest("foo %.1E", val, "foo 2.6E+002", "foo 2.6E+02"); + DoDoubleTest("foo %.8E", val, "foo 2.56000000E+002", "foo 2.56000000E+02"); + DoDoubleTest("foo %014E", val, "foo 02.560000E+002", "foo 002.560000E+02"); + DoDoubleTest("foo %#E", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %+E", val, "foo +2.560000E+002", "foo +2.560000E+02"); + DoDoubleTest("foo % E", val, "foo 2.560000E+002", "foo 2.560000E+02"); + DoDoubleTest("foo %+E", neg, "foo -2.560000E+002", "foo -2.560000E+02"); + DoDoubleTest("foo % E", neg, "foo -2.560000E+002", "foo -2.560000E+02"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat new file mode 100644 index 0000000000..913912508e --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test15 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with exponential format doubles (uppercase). += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt new file mode 100644 index 0000000000..1fd88667d8 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test16.cpp +) + +add_executable(paltest_vsnprintf_test16 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test16 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test16 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp new file mode 100644 index 0000000000..de9b74f9b3 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp @@ -0,0 +1,49 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test16.c +** +** Purpose: Test #16 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + double val = 2560.001; + double neg = -2560.001; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoDoubleTest("foo %f", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %lf", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %hf", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %Lf", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %I64f", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %12f", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %-12f", val, "foo 2560.001000 ", "foo 2560.001000 "); + DoDoubleTest("foo %.1f", val, "foo 2560.0", "foo 2560.0"); + DoDoubleTest("foo %.8f", val, "foo 2560.00100000", "foo 2560.00100000"); + DoDoubleTest("foo %012f", val, "foo 02560.001000", "foo 02560.001000"); + DoDoubleTest("foo %#f", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %+f", val, "foo +2560.001000", "foo +2560.001000"); + DoDoubleTest("foo % f", val, "foo 2560.001000", "foo 2560.001000"); + DoDoubleTest("foo %+f", neg, "foo -2560.001000", "foo -2560.001000"); + DoDoubleTest("foo % f", neg, "foo -2560.001000", "foo -2560.001000"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat new file mode 100644 index 0000000000..fc2f13071b --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test16 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with decimal point format doubles. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt new file mode 100644 index 0000000000..ffd52caa65 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test17.cpp +) + +add_executable(paltest_vsnprintf_test17 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test17 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test17 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp new file mode 100644 index 0000000000..3304eda7f9 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp @@ -0,0 +1,50 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test17.c +** +** Purpose: Test #17 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + double val = 2560.001; + double neg = -2560.001; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoDoubleTest("foo %g", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %lg", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %hg", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %Lg", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %I64g", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %5g", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %-5g", val, "foo 2560 ", "foo 2560 "); + DoDoubleTest("foo %.1g", val, "foo 3e+003", "foo 3e+03"); + DoDoubleTest("foo %.2g", val, "foo 2.6e+003", "foo 2.6e+03"); + DoDoubleTest("foo %.12g", val, "foo 2560.001", "foo 2560.001"); + DoDoubleTest("foo %06g", val, "foo 002560", "foo 002560"); + DoDoubleTest("foo %#g", val, "foo 2560.00", "foo 2560.00"); + DoDoubleTest("foo %+g", val, "foo +2560", "foo +2560"); + DoDoubleTest("foo % g", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %+g", neg, "foo -2560", "foo -2560"); + DoDoubleTest("foo % g", neg, "foo -2560", "foo -2560"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat new file mode 100644 index 0000000000..aeb924495c --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test17 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with compact format doubles (lowercase). += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt new file mode 100644 index 0000000000..1bd8e3bc5a --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test18.cpp +) + +add_executable(paltest_vsnprintf_test18 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test18 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test18 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp new file mode 100644 index 0000000000..14ad8f583a --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp @@ -0,0 +1,50 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test18.c +** +** Purpose: Test #18 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + double val = 2560.001; + double neg = -2560.001; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoDoubleTest("foo %G", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %lG", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %hG", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %LG", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %I64G", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %5G", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %-5G", val, "foo 2560 ", "foo 2560 "); + DoDoubleTest("foo %.1G", val, "foo 3E+003", "foo 3E+03"); + DoDoubleTest("foo %.2G", val, "foo 2.6E+003", "foo 2.6E+03"); + DoDoubleTest("foo %.12G", val, "foo 2560.001", "foo 2560.001"); + DoDoubleTest("foo %06G", val, "foo 002560", "foo 002560"); + DoDoubleTest("foo %#G", val, "foo 2560.00", "foo 2560.00"); + DoDoubleTest("foo %+G", val, "foo +2560", "foo +2560"); + DoDoubleTest("foo % G", val, "foo 2560", "foo 2560"); + DoDoubleTest("foo %+G", neg, "foo -2560", "foo -2560"); + DoDoubleTest("foo % G", neg, "foo -2560", "foo -2560"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat new file mode 100644 index 0000000000..57aaed5953 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test18 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with compact format doubles (uppercase). += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt new file mode 100644 index 0000000000..3848c130b0 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test19.cpp +) + +add_executable(paltest_vsnprintf_test19 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test19 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test19 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp new file mode 100644 index 0000000000..6f2aefa94c --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp @@ -0,0 +1,103 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test19.c +** +** Purpose: Test #19 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +#define DOTEST(a,b,c,d,e) DoTest(a,b,(void*)c,d,e) + +void DoArgumentPrecTest(char *formatstr, int precision, void *param, + char *paramstr, char *checkstr1, char *checkstr2) +{ + char buf[256]; + + Testvsnprintf(buf,256,formatstr, precision, param); + if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && + memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) + { + Fail("ERROR: failed to insert %s into \"%s\" with precision %d\n" + "Expected \"%s\" or \"%s\", got \"%s\".\n", + paramstr, formatstr, precision, checkstr1, checkstr2, buf); + } + +} + +void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, + char *checkstr1, char *checkstr2) +{ + char buf[256]; + + Testvsnprintf(buf,256,formatstr, precision, param); + if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && + memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) + { + Fail("ERROR: failed to insert %f into \"%s\" with precision %d\n" + "Expected \"%s\" or \"%s\", got \"%s\".\n", + param, formatstr, precision, checkstr1, checkstr2, buf); + } + +} + + + +int __cdecl main(int argc, char *argv[]) +{ + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + + DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba"); + DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba"); + DoArgumentPrecTest("%.*c", 0, (void*)'a', "a", "a", "a"); + DoArgumentPrecTest("%.*c", 4, (void*)'a', "a", "a", "a"); + DoArgumentPrecTest("%.*C", 0, (void*)'a', "a", "a", "a"); + DoArgumentPrecTest("%.*C", 4, (void*)'a', "a", "a", "a"); + DoArgumentPrecTest("%.*d", 1, (void*)42, "42", "42", "42"); + DoArgumentPrecTest("%.*d", 3, (void*)42, "42", "042", "042"); + DoArgumentPrecTest("%.*i", 1, (void*)42, "42", "42", "42"); + DoArgumentPrecTest("%.*i", 3, (void*)42, "42", "042", "042"); + DoArgumentPrecTest("%.*o", 1, (void*)42, "42", "52", "52"); + DoArgumentPrecTest("%.*o", 3, (void*)42, "42", "052", "052"); + DoArgumentPrecTest("%.*u", 1, (void*)42, "42", "42", "42"); + DoArgumentPrecTest("%.*u", 3, (void*)42, "42", "042", "042"); + DoArgumentPrecTest("%.*x", 1, (void*)0x42, "0x42", "42", "42"); + DoArgumentPrecTest("%.*x", 3, (void*)0x42, "0x42", "042", "042"); + DoArgumentPrecTest("%.*X", 1, (void*)0x42, "0x42", "42", "42"); + DoArgumentPrecTest("%.*X", 3, (void*)0x42, "0x42", "042", "042"); + + + DoArgumentPrecDoubleTest("%.*e", 1, 2.01, "2.0e+000", "2.0e+00"); + DoArgumentPrecDoubleTest("%.*e", 3, 2.01, "2.010e+000", "2.010e+00"); + DoArgumentPrecDoubleTest("%.*E", 1, 2.01, "2.0E+000", "2.0E+00"); + DoArgumentPrecDoubleTest("%.*E", 3, 2.01, "2.010E+000", "2.010E+00"); + DoArgumentPrecDoubleTest("%.*f", 1, 2.01, "2.0", "2.0"); + DoArgumentPrecDoubleTest("%.*f", 3, 2.01, "2.010", "2.010"); + DoArgumentPrecDoubleTest("%.*g", 1, 256.01, "3e+002", "3e+02"); + DoArgumentPrecDoubleTest("%.*g", 3, 256.01, "256", "256"); + DoArgumentPrecDoubleTest("%.*g", 4, 256.01, "256", "256"); + DoArgumentPrecDoubleTest("%.*g", 6, 256.01, "256.01", "256.01"); + DoArgumentPrecDoubleTest("%.*G", 1, 256.01, "3E+002", "3E+02"); + DoArgumentPrecDoubleTest("%.*G", 3, 256.01, "256", "256"); + DoArgumentPrecDoubleTest("%.*G", 4, 256.01, "256", "256"); + DoArgumentPrecDoubleTest("%.*G", 6, 256.01, "256.01", "256.01"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat new file mode 100644 index 0000000000..cda8966865 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test19 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with argument specified precision. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt new file mode 100644 index 0000000000..5bdf0acff3 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test2.cpp +) + +add_executable(paltest_vsnprintf_test2 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test2 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test2 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp new file mode 100644 index 0000000000..e5808f363e --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp @@ -0,0 +1,50 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test2.c +** +** Purpose: Test #2 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + WCHAR szwStr[] = {'b','a','r','\0'}; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoStrTest("foo %s", "bar", "foo bar"); + DoStrTest("foo %hs", "bar", "foo bar"); + DoWStrTest("foo %ls", szwStr, "foo bar"); + DoWStrTest("foo %ws", szwStr, "foo bar"); + DoStrTest("foo %Ls", "bar", "foo bar"); + DoStrTest("foo %I64s", "bar", "foo bar"); + DoStrTest("foo %5s", "bar", "foo bar"); + DoStrTest("foo %.2s", "bar", "foo ba"); + DoStrTest("foo %5.2s", "bar", "foo ba"); + DoStrTest("foo %-5s", "bar", "foo bar "); + DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); + + PAL_Terminate(); + return PASS; +} + diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat new file mode 100644 index 0000000000..6e8f03e639 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test2 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with strings. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt new file mode 100644 index 0000000000..7268cf17f7 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test3.cpp +) + +add_executable(paltest_vsnprintf_test3 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test3 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test3 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp new file mode 100644 index 0000000000..bb8b153b52 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp @@ -0,0 +1,49 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test3.c +** +** Purpose: Test #3 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoWStrTest("foo %S", convert("bar"), "foo bar"); + DoStrTest("foo %hS", "bar", "foo bar"); + DoWStrTest("foo %lS", convert("bar"), "foo bar"); + DoWStrTest("foo %wS", convert("bar"), "foo bar"); + DoWStrTest("foo %LS", convert("bar"), "foo bar"); + DoWStrTest("foo %I64S", convert("bar"), "foo bar"); + DoWStrTest("foo %5S", convert("bar"), "foo bar"); + DoWStrTest("foo %.2S", convert("bar"), "foo ba"); + DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); + DoWStrTest("foo %-5S", convert("bar"), "foo bar "); + DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat new file mode 100644 index 0000000000..638cef69ef --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test3 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with wide strings. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt new file mode 100644 index 0000000000..f2419479fd --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test4.cpp +) + +add_executable(paltest_vsnprintf_test4 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test4 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test4 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp new file mode 100644 index 0000000000..c4a77f957d --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp @@ -0,0 +1,98 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test4.c +** +** Purpose: Test #4 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +static void DoPointerTest(char *formatstr, void* param, char* paramstr, + char *checkstr1) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf,256, formatstr, param); + if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0) + { + Fail("ERROR: failed to insert %s into \"%s\"\n" + "Expected \"%s\" got \"%s\".\n", + paramstr, formatstr, checkstr1, buf); + } +} + +static void DoI64DoubleTest(char *formatstr, INT64 value, char *valuestr, char +*checkstr1) +{ + char buf[256] = { 0 }; + + Testvsnprintf(buf,256,formatstr, value); + if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0) + { + Fail("ERROR: failed to insert %s into \"%s\"\n" + "Expected \"%s\", got \"%s\".\n", + valuestr, formatstr, checkstr1, buf); + } +} + +int __cdecl main(int argc, char *argv[]) +{ + void *ptr = (void*) 0x123456; + INT64 lptr = I64(0x1234567887654321); + + if (PAL_Initialize(argc, argv) != 0) + return(FAIL); + + + /* +** Run only on 64 bit platforms +*/ +#if defined(BIT64) + Trace("Testing for 64 Bit Platforms \n"); + DoPointerTest("%p", NULL, "NULL", "0000000000000000"); + DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); + DoPointerTest("%17p", ptr, "pointer to 0x123456", " 0000000000123456"); + DoPointerTest("%17p", ptr, "pointer to 0x123456", " 0000000000123456"); + DoPointerTest("%-17p", ptr, "pointer to 0x123456", "0000000000123456 "); + DoPointerTest("%+p", ptr, "pointer to 0x123456", "0000000000123456"); + DoPointerTest("%#p", ptr, "pointer to 0x123456", "0X0000000000123456"); + DoPointerTest("%lp", ptr, "pointer to 0x123456", "00123456"); + DoPointerTest("%hp", ptr, "pointer to 0x123456", "00003456"); + DoPointerTest("%Lp", ptr, "pointer to 0x123456", "00123456"); + DoI64DoubleTest("%I64p", lptr, "pointer to 0x1234567887654321", + "1234567887654321"); + +#else + Trace("Testing for Non 64 Bit Platforms \n"); + DoPointerTest("%p", NULL, "NULL", "00000000"); + DoPointerTest("%p", ptr, "pointer to 0x123456", "00123456"); + DoPointerTest("%9p", ptr, "pointer to 0x123456", " 00123456"); + DoPointerTest("%09p", ptr, "pointer to 0x123456", " 00123456"); + DoPointerTest("%-9p", ptr, "pointer to 0x123456", "00123456 "); + DoPointerTest("%+p", ptr, "pointer to 0x123456", "00123456"); + DoPointerTest("%#p", ptr, "pointer to 0x123456", "0X00123456"); + DoPointerTest("%lp", ptr, "pointer to 0x123456", "00123456"); + DoPointerTest("%hp", ptr, "pointer to 0x123456", "00003456"); + DoPointerTest("%Lp", ptr, "pointer to 0x123456", "00123456"); + DoI64DoubleTest("%I64p", lptr, "pointer to 0x1234567887654321", + "1234567887654321"); +#endif + + + + + PAL_Terminate(); + return PASS; +} + diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat new file mode 100644 index 0000000000..03ff2931bc --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test4 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with pointers. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt new file mode 100644 index 0000000000..3c6b43fe20 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test6.cpp +) + +add_executable(paltest_vsnprintf_test6 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test6 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test6 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp new file mode 100644 index 0000000000..cbcead88b5 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp @@ -0,0 +1,44 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test6.c +** +** Purpose: Test #6 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + +int __cdecl main(int argc, char *argv[]) +{ + WCHAR wc = (WCHAR) 'c'; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoCharTest("foo %c", 'b', "foo b"); + DoCharTest("foo %hc", 'b', "foo b"); + DoWCharTest("foo %lc", wc, "foo c"); + DoCharTest("foo %Lc", 'b', "foo b"); + DoCharTest("foo %I64c", 'b', "foo b"); + DoCharTest("foo %5c", 'b', "foo b"); + DoCharTest("foo %.0c", 'b', "foo b"); + DoCharTest("foo %-5c", 'b', "foo b "); + DoCharTest("foo %05c", 'b', "foo 0000b"); + DoCharTest("foo % c", 'b', "foo b"); + DoCharTest("foo %#c", 'b', "foo b"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat new file mode 100644 index 0000000000..e375f9238d --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test6 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with characters. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt new file mode 100644 index 0000000000..6708b39001 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test7.cpp +) + +add_executable(paltest_vsnprintf_test7 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test7 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test7 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp new file mode 100644 index 0000000000..4843d27598 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp @@ -0,0 +1,44 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test7.c +** +** Purpose: Test #7 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" +/* + * Notes: memcmp is used, as is strlen. + */ + + +int __cdecl main(int argc, char *argv[]) +{ + WCHAR wb = (WCHAR) 'b'; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoWCharTest("foo %c", wb, "foo b"); + DoWCharTest("foo %hc", wb, "foo b"); + DoCharTest("foo %lc", 'c', "foo c"); + DoWCharTest("foo %Lc", wb, "foo b"); + DoWCharTest("foo %I64c", wb, "foo b"); + DoWCharTest("foo %5c", wb, "foo b"); + DoWCharTest("foo %.0c", wb, "foo b"); + DoWCharTest("foo %-5c", wb, "foo b "); + DoWCharTest("foo %05c", wb, "foo 0000b"); + DoWCharTest("foo % c", wb, "foo b"); + DoWCharTest("foo %#c", wb, "foo b"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat new file mode 100644 index 0000000000..09eb481b59 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test7 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with wide characters. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt new file mode 100644 index 0000000000..8a396fdcf2 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test8.cpp +) + +add_executable(paltest_vsnprintf_test8 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test8 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test8 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp new file mode 100644 index 0000000000..8021a797c8 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test8.c +** +** Purpose: Test #8 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + + +int __cdecl main(int argc, char *argv[]) +{ + int neg = -42; + int pos = 42; + INT64 l = 42; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoNumTest("foo %d", pos, "foo 42"); + DoNumTest("foo %ld", 0xFFFF, "foo 65535"); + DoNumTest("foo %hd", 0xFFFF, "foo -1"); + DoNumTest("foo %Ld", pos, "foo 42"); + DoI64Test("foo %I64d", l, "42", "foo 42"); + DoNumTest("foo %3d", pos, "foo 42"); + DoNumTest("foo %-3d", pos, "foo 42 "); + DoNumTest("foo %.1d", pos, "foo 42"); + DoNumTest("foo %.3d", pos, "foo 042"); + DoNumTest("foo %03d", pos, "foo 042"); + DoNumTest("foo %#d", pos, "foo 42"); + DoNumTest("foo %+d", pos, "foo +42"); + DoNumTest("foo % d", pos, "foo 42"); + DoNumTest("foo %+d", neg, "foo -42"); + DoNumTest("foo % d", neg, "foo -42"); + + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat new file mode 100644 index 0000000000..1bdf411983 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test8 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with decimal numbers. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt new file mode 100644 index 0000000000..136856b649 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(SOURCES + test9.cpp +) + +add_executable(paltest_vsnprintf_test9 + ${SOURCES} +) + +add_dependencies(paltest_vsnprintf_test9 coreclrpal) + +target_link_libraries(paltest_vsnprintf_test9 + ${COMMON_TEST_LIBRARIES} +) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp new file mode 100644 index 0000000000..d36846e401 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp @@ -0,0 +1,51 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +/*===================================================================== +** +** Source: test9.c +** +** Purpose: Test #9 for the _vsnprintf function. +** +** +**===================================================================*/ + +#include +#include "../_vsnprintf_s.h" + +/* + * Notes: memcmp is used, as is strlen. + */ + + +int __cdecl main(int argc, char *argv[]) +{ + int neg = -42; + int pos = 42; + INT64 l = 42; + + if (PAL_Initialize(argc, argv) != 0) + { + return(FAIL); + } + + DoNumTest("foo %i", pos, "foo 42"); + DoNumTest("foo %li", 0xFFFF, "foo 65535"); + DoNumTest("foo %hi", 0xFFFF, "foo -1"); + DoNumTest("foo %Li", pos, "foo 42"); + DoI64Test("foo %I64i", l, "42", "foo 42"); + DoNumTest("foo %3i", pos, "foo 42"); + DoNumTest("foo %-3i", pos, "foo 42 "); + DoNumTest("foo %.1i", pos, "foo 42"); + DoNumTest("foo %.3i", pos, "foo 042"); + DoNumTest("foo %03i", pos, "foo 042"); + DoNumTest("foo %#i", pos, "foo 42"); + DoNumTest("foo %+i", pos, "foo +42"); + DoNumTest("foo % i", pos, "foo 42"); + DoNumTest("foo %+i", neg, "foo -42"); + DoNumTest("foo % i", neg, "foo -42"); + + PAL_Terminate(); + return PASS; +} diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat new file mode 100644 index 0000000000..bdaae87ce8 --- /dev/null +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat @@ -0,0 +1,14 @@ +# Licensed to the .NET Foundation under one or more agreements. +# The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. + +Version = 1.0 +Section = C Runtime +Function = _vsnprintf +Name = Positive Test for _vsnprintf +TYPE = DEFAULT +EXE1 = test9 +Description += Tests the PAL implementation of the _vsnprintf function. += Tests _vsnprintf with integer numbers. += This test is modeled after sprintf_s. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt index d1245168f3..0138111408 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test1 add_dependencies(paltest_vsnwprintf_test1 coreclrpal) target_link_libraries(paltest_vsnwprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt index 6367964f1d..e669b1e47c 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test10 add_dependencies(paltest_vsnwprintf_test10 coreclrpal) target_link_libraries(paltest_vsnwprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt index b45fd0ed1e..acb914b93e 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test11 add_dependencies(paltest_vsnwprintf_test11 coreclrpal) target_link_libraries(paltest_vsnwprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt index 2a15b198c0..0d83d5be91 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test12 add_dependencies(paltest_vsnwprintf_test12 coreclrpal) target_link_libraries(paltest_vsnwprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt index 01ab97cc62..27f37405f4 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test13 add_dependencies(paltest_vsnwprintf_test13 coreclrpal) target_link_libraries(paltest_vsnwprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt index c6c990312f..6e0a35e8b5 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test14 add_dependencies(paltest_vsnwprintf_test14 coreclrpal) target_link_libraries(paltest_vsnwprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt index e1a32b1825..f13b1f28bb 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test15 add_dependencies(paltest_vsnwprintf_test15 coreclrpal) target_link_libraries(paltest_vsnwprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt index 9e2b25b308..2b45d4c77e 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test16 add_dependencies(paltest_vsnwprintf_test16 coreclrpal) target_link_libraries(paltest_vsnwprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt index 2d8ba31a08..a4cc151d5e 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test17 add_dependencies(paltest_vsnwprintf_test17 coreclrpal) target_link_libraries(paltest_vsnwprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt index 503856c2f3..9bf17f3e33 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test18 add_dependencies(paltest_vsnwprintf_test18 coreclrpal) target_link_libraries(paltest_vsnwprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt index 68485eff12..7f95eb1429 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test19 add_dependencies(paltest_vsnwprintf_test19 coreclrpal) target_link_libraries(paltest_vsnwprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt index a512be6e47..27231e9de6 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test2 add_dependencies(paltest_vsnwprintf_test2 coreclrpal) target_link_libraries(paltest_vsnwprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp index 18e5adffd3..b2958dfa8d 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test2/test2.cpp @@ -34,6 +34,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest(convert("foo %5.2s"), convert("bar"), convert("foo ba")); DoWStrTest(convert("foo %-5s"), convert("bar"), convert("foo bar ")); DoWStrTest(convert("foo %05s"), convert("bar"), convert("foo 00bar")); + DoWStrTest(convert("foo %s"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hs"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ws"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %Ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %I64s"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt index 7991c25afc..205e5a5272 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test3 add_dependencies(paltest_vsnwprintf_test3 coreclrpal) target_link_libraries(paltest_vsnwprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp index 5e2bfa21a0..657a911b5c 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test3/test3.cpp @@ -34,6 +34,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest(convert("foo %5.2S"), "bar", convert("foo ba")); DoStrTest(convert("foo %-5S"), "bar", convert("foo bar ")); DoStrTest(convert("foo %05S"), "bar", convert("foo 00bar")); + DoStrTest(convert("foo %S"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %lS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %wS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %LS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %I64S"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt index 18f5d02df2..fd2666e974 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test4 add_dependencies(paltest_vsnwprintf_test4 coreclrpal) target_link_libraries(paltest_vsnwprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp index 3627ff8bc8..006e154f70 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test4/test4.cpp @@ -64,7 +64,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest(convert("%p"), NULL, convert("NULL"), convert("00000000")); DoPointerTest(convert("%p"), ptr, convert("pointer to 0x123456"), diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt index c431da4a00..1ff12213f7 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test6 add_dependencies(paltest_vsnwprintf_test6 coreclrpal) target_link_libraries(paltest_vsnwprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt index 5759b836b5..fe46de483d 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test7 add_dependencies(paltest_vsnwprintf_test7 coreclrpal) target_link_libraries(paltest_vsnwprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt index 5e8a6284a5..7ce0aa81ab 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test8 add_dependencies(paltest_vsnwprintf_test8 coreclrpal) target_link_libraries(paltest_vsnwprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt index 323365dcd9..69a9de3a54 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnwprintf_test9 add_dependencies(paltest_vsnwprintf_test9 coreclrpal) target_link_libraries(paltest_vsnwprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt index 023b777cab..1a70e342c6 100644 --- a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsicmp_test1 add_dependencies(paltest_wcsicmp_test1 coreclrpal) target_link_libraries(paltest_wcsicmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt index b9df132d29..b10e14ceb7 100644 --- a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcslwr_test1 add_dependencies(paltest_wcslwr_test1 coreclrpal) target_link_libraries(paltest_wcslwr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt index ea22daa477..3fa3b3842d 100644 --- a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsnicmp_test1 add_dependencies(paltest_wcsnicmp_test1 coreclrpal) target_link_libraries(paltest_wcsnicmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt index f7aa22d5b2..35498c0ecc 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test1 add_dependencies(paltest_wfopen_test1 coreclrpal) target_link_libraries(paltest_wfopen_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt index 3159889f0a..5a049441b7 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test2 add_dependencies(paltest_wfopen_test2 coreclrpal) target_link_libraries(paltest_wfopen_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt index 06d0941471..1a1656ebf7 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test3 add_dependencies(paltest_wfopen_test3 coreclrpal) target_link_libraries(paltest_wfopen_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt index 8253d75d8d..bc56cd9507 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test4 add_dependencies(paltest_wfopen_test4 coreclrpal) target_link_libraries(paltest_wfopen_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt index 8b3d064ec6..42caa20594 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test5 add_dependencies(paltest_wfopen_test5 coreclrpal) target_link_libraries(paltest_wfopen_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt index bf1eaeca27..c2fb9e7b8b 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test6 add_dependencies(paltest_wfopen_test6 coreclrpal) target_link_libraries(paltest_wfopen_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt index 5d04528a21..13f7b00a20 100644 --- a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wfopen_test7 add_dependencies(paltest_wfopen_test7 coreclrpal) target_link_libraries(paltest_wfopen_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt index ed02fec3af..b04d4abbe6 100644 --- a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wtoi_test1 add_dependencies(paltest_wtoi_test1 coreclrpal) target_link_libraries(paltest_wtoi_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt index b01d97ff2f..c09c03939c 100644 --- a/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_abs_test1 add_dependencies(paltest_abs_test1 coreclrpal) target_link_libraries(paltest_abs_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt index 5bd3ae06e8..7f473d072d 100644 --- a/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_acos_test1 add_dependencies(paltest_acos_test1 coreclrpal) target_link_libraries(paltest_acos_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt index 2643647438..095be954de 100644 --- a/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/acosf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_acosf_test1 add_dependencies(paltest_acosf_test1 coreclrpal) target_link_libraries(paltest_acosf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt index 510b543a59..3537fe6efe 100644 --- a/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_asin_test1 add_dependencies(paltest_asin_test1 coreclrpal) target_link_libraries(paltest_asin_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt index b167bd8715..46661a745a 100644 --- a/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/asinf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_asinf_test1 add_dependencies(paltest_asinf_test1 coreclrpal) target_link_libraries(paltest_asinf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt index ace64e48bc..ef6cca78d2 100644 --- a/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atan_test1 add_dependencies(paltest_atan_test1 coreclrpal) target_link_libraries(paltest_atan_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt index cafa09f7fe..4246b3730a 100644 --- a/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atan2_test1 add_dependencies(paltest_atan2_test1 coreclrpal) target_link_libraries(paltest_atan2_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt index d71a61b17b..d70946ea8c 100644 --- a/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atan2f/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atan2f_test1 add_dependencies(paltest_atan2f_test1 coreclrpal) target_link_libraries(paltest_atan2f_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt index b71b1cf40c..2a08f6d739 100644 --- a/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atanf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atanf_test1 add_dependencies(paltest_atanf_test1 coreclrpal) target_link_libraries(paltest_atanf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt index 12e584b9a0..4917e424dc 100644 --- a/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atof_test1 add_dependencies(paltest_atof_test1 coreclrpal) target_link_libraries(paltest_atof_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt index 225052213f..d545811b9a 100644 --- a/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atoi_test1 add_dependencies(paltest_atoi_test1 coreclrpal) target_link_libraries(paltest_atoi_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt index 29643aae6b..0335137eb6 100644 --- a/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_atol_test1 add_dependencies(paltest_atol_test1 coreclrpal) target_link_libraries(paltest_atol_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt index c5aab7b84d..a1242e6a37 100644 --- a/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_bsearch_test1 add_dependencies(paltest_bsearch_test1 coreclrpal) target_link_libraries(paltest_bsearch_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt index 7ad33b12e5..167b8aac69 100644 --- a/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_bsearch_test2 add_dependencies(paltest_bsearch_test2 coreclrpal) target_link_libraries(paltest_bsearch_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt index f834914545..c1473daa9d 100644 --- a/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ceil_test1 add_dependencies(paltest_ceil_test1 coreclrpal) target_link_libraries(paltest_ceil_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt index 64f14cda9a..b1fbe07100 100644 --- a/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ceilf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ceilf_test1 add_dependencies(paltest_ceilf_test1 coreclrpal) target_link_libraries(paltest_ceilf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt index 536664c128..936a876c3f 100644 --- a/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_cos_test1 add_dependencies(paltest_cos_test1 coreclrpal) target_link_libraries(paltest_cos_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt index b3a18ea271..db4efe4ac7 100644 --- a/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/cosf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_cosf_test1 add_dependencies(paltest_cosf_test1 coreclrpal) target_link_libraries(paltest_cosf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt index e1fff0e9f1..ec8038a160 100644 --- a/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_cosh_test1 add_dependencies(paltest_cosh_test1 coreclrpal) target_link_libraries(paltest_cosh_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt index 92fcfdea6d..3b873eec94 100644 --- a/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/coshf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_coshf_test1 add_dependencies(paltest_coshf_test1 coreclrpal) target_link_libraries(paltest_coshf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt index 3eeffb0e39..b7d1b99b2f 100644 --- a/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ctime_test1 add_dependencies(paltest_ctime_test1 coreclrpal) target_link_libraries(paltest_ctime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt index 91b8d094b1..8c27c78d6d 100644 --- a/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_errno_test1 add_dependencies(paltest_errno_test1 coreclrpal) target_link_libraries(paltest_errno_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt index ab7c4a27f2..e66c359207 100644 --- a/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_errno_test2 add_dependencies(paltest_errno_test2 coreclrpal) target_link_libraries(paltest_errno_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt index bb2cbccb9b..3f34da6fd2 100644 --- a/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exit_test1 add_dependencies(paltest_exit_test1 coreclrpal) target_link_libraries(paltest_exit_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt index 8a74e75ed5..5327b57896 100644 --- a/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exit_test2 add_dependencies(paltest_exit_test2 coreclrpal) target_link_libraries(paltest_exit_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt index 3377ed22f2..a28565835b 100644 --- a/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exp_test1 add_dependencies(paltest_exp_test1 coreclrpal) target_link_libraries(paltest_exp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt index fb12b65c2f..5ff0d09d81 100644 --- a/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/expf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_expf_test1 add_dependencies(paltest_expf_test1 coreclrpal) target_link_libraries(paltest_expf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt index fa01a34dd9..9dab6796f2 100644 --- a/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fabs_test1 add_dependencies(paltest_fabs_test1 coreclrpal) target_link_libraries(paltest_fabs_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt index a1823e25e5..dc46a2335d 100644 --- a/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fabsf_test1 add_dependencies(paltest_fabsf_test1 coreclrpal) target_link_libraries(paltest_fabsf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt index 64cfef0e18..5fe80e02bc 100644 --- a/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fclose_test1 add_dependencies(paltest_fclose_test1 coreclrpal) target_link_libraries(paltest_fclose_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt index 3b5538608f..efe4c85207 100644 --- a/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fclose_test2 add_dependencies(paltest_fclose_test2 coreclrpal) target_link_libraries(paltest_fclose_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt index 9f689503e6..e870038450 100644 --- a/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_feof_test1 add_dependencies(paltest_feof_test1 coreclrpal) target_link_libraries(paltest_feof_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt index cd1fe52381..e8a282f6be 100644 --- a/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ferror_test1 add_dependencies(paltest_ferror_test1 coreclrpal) target_link_libraries(paltest_ferror_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt index 05bd7fd2f1..deb3f1f927 100644 --- a/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ferror_test2 add_dependencies(paltest_ferror_test2 coreclrpal) target_link_libraries(paltest_ferror_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt index 58c7c5a3a4..ef13ca4194 100644 --- a/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fflush_test1 add_dependencies(paltest_fflush_test1 coreclrpal) target_link_libraries(paltest_fflush_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt index d327d6882a..40f9c65879 100644 --- a/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fgets_test1 add_dependencies(paltest_fgets_test1 coreclrpal) target_link_libraries(paltest_fgets_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt index 23bcdef686..a2d2563df5 100644 --- a/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fgets_test2 add_dependencies(paltest_fgets_test2 coreclrpal) target_link_libraries(paltest_fgets_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt index 0833ad0130..37398b8349 100644 --- a/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fgets_test3 add_dependencies(paltest_fgets_test3 coreclrpal) target_link_libraries(paltest_fgets_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt index 3222ed8ba3..4324626b87 100644 --- a/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_floor_test1 add_dependencies(paltest_floor_test1 coreclrpal) target_link_libraries(paltest_floor_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt index f6e24adcd9..8834f4dfa2 100644 --- a/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/floorf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_floorf_test1 add_dependencies(paltest_floorf_test1 coreclrpal) target_link_libraries(paltest_floorf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt index 33fbfb2653..22bcd3a00d 100644 --- a/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fmod_test1 add_dependencies(paltest_fmod_test1 coreclrpal) target_link_libraries(paltest_fmod_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt index 487b3adda4..861f3d7219 100644 --- a/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fmodf_test1 add_dependencies(paltest_fmodf_test1 coreclrpal) target_link_libraries(paltest_fmodf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt index 7603fc623e..955979a6a3 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test1 add_dependencies(paltest_fopen_test1 coreclrpal) target_link_libraries(paltest_fopen_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt index b8569921de..3738f86fa8 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test2 add_dependencies(paltest_fopen_test2 coreclrpal) target_link_libraries(paltest_fopen_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt index 5b28caf4ba..88df51d41f 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test3 add_dependencies(paltest_fopen_test3 coreclrpal) target_link_libraries(paltest_fopen_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt index db5779f282..f31c5d1e5d 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test4 add_dependencies(paltest_fopen_test4 coreclrpal) target_link_libraries(paltest_fopen_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt index 6341e4a7d2..975351d39a 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test5 add_dependencies(paltest_fopen_test5 coreclrpal) target_link_libraries(paltest_fopen_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt index 39cf9158bb..1e235856bb 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test6 add_dependencies(paltest_fopen_test6 coreclrpal) target_link_libraries(paltest_fopen_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt index ee22e347d6..dd81aa9289 100644 --- a/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fopen_test7 add_dependencies(paltest_fopen_test7 coreclrpal) target_link_libraries(paltest_fopen_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt index 60ffd49cf5..277cee42ab 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test1 add_dependencies(paltest_fprintf_test1 coreclrpal) target_link_libraries(paltest_fprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt index 3fb57c217c..7f9dd41db3 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test10 add_dependencies(paltest_fprintf_test10 coreclrpal) target_link_libraries(paltest_fprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt index d325ce225e..a5365b4fc4 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test11 add_dependencies(paltest_fprintf_test11 coreclrpal) target_link_libraries(paltest_fprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt index 8bd3970e80..40425217e2 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test12 add_dependencies(paltest_fprintf_test12 coreclrpal) target_link_libraries(paltest_fprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt index 702058b797..47ba3cb5ba 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test13 add_dependencies(paltest_fprintf_test13 coreclrpal) target_link_libraries(paltest_fprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt index b92ede7c87..dc3186c743 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test14 add_dependencies(paltest_fprintf_test14 coreclrpal) target_link_libraries(paltest_fprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt index 20f1e42aab..91718eeed8 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test15 add_dependencies(paltest_fprintf_test15 coreclrpal) target_link_libraries(paltest_fprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt index 8d72421210..26dc1f8f59 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test16 add_dependencies(paltest_fprintf_test16 coreclrpal) target_link_libraries(paltest_fprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt index 82d1f84f31..9493f54962 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test17 add_dependencies(paltest_fprintf_test17 coreclrpal) target_link_libraries(paltest_fprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt index 1ca54e42b7..21a2e87887 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test18 add_dependencies(paltest_fprintf_test18 coreclrpal) target_link_libraries(paltest_fprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt index 2c66239801..419d180fcf 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test19 add_dependencies(paltest_fprintf_test19 coreclrpal) target_link_libraries(paltest_fprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt index ae1d9dc64d..88bd04c75f 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test2 add_dependencies(paltest_fprintf_test2 coreclrpal) target_link_libraries(paltest_fprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp index 1ed7f3fd23..1441827489 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp @@ -36,6 +36,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt index 4b10c4c407..42d3977e05 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test3 add_dependencies(paltest_fprintf_test3 coreclrpal) target_link_libraries(paltest_fprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp index 6185135581..dd34c08536 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp @@ -35,6 +35,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt index 292bdb6625..7e6cc18f18 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test4 add_dependencies(paltest_fprintf_test4 coreclrpal) target_link_libraries(paltest_fprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp index 51ec1f099c..ef3108d864 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp @@ -75,7 +75,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoTest("%p", NULL, "NULL", "0000000000000000", "0x0"); DoTest("%p", ptr, "pointer to 0x123456", "0000000000123456", "0x123456"); diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt index 370ed3329a..6cea5197a0 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test5 add_dependencies(paltest_fprintf_test5 coreclrpal) target_link_libraries(paltest_fprintf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt index bd1cbda924..9e3cf01393 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test6 add_dependencies(paltest_fprintf_test6 coreclrpal) target_link_libraries(paltest_fprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt index 38429e7900..92dd50ab34 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test7 add_dependencies(paltest_fprintf_test7 coreclrpal) target_link_libraries(paltest_fprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt index 990eca26b0..9aa9af8211 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test8 add_dependencies(paltest_fprintf_test8 coreclrpal) target_link_libraries(paltest_fprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt index 715d38a431..6a7bb4de3d 100644 --- a/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fprintf_test9 add_dependencies(paltest_fprintf_test9 coreclrpal) target_link_libraries(paltest_fprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt index d0f1aca0e6..1e0fbcb60b 100644 --- a/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fputs_test1 add_dependencies(paltest_fputs_test1 coreclrpal) target_link_libraries(paltest_fputs_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt index 9242ea16e5..074500bb24 100644 --- a/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fputs_test2 add_dependencies(paltest_fputs_test2 coreclrpal) target_link_libraries(paltest_fputs_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt index 1bd84b5c62..71204c0796 100644 --- a/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fread_test1 add_dependencies(paltest_fread_test1 coreclrpal) target_link_libraries(paltest_fread_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt index 93e0394832..1bae93e439 100644 --- a/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fread_test2 add_dependencies(paltest_fread_test2 coreclrpal) target_link_libraries(paltest_fread_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt index 285608bc3d..a678e2e110 100644 --- a/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fread_test3 add_dependencies(paltest_fread_test3 coreclrpal) target_link_libraries(paltest_fread_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt index 92ee9896c7..66c0b568d0 100644 --- a/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_free_test1 add_dependencies(paltest_free_test1 coreclrpal) target_link_libraries(paltest_free_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt index 59ee8b4563..906a935f1c 100644 --- a/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fseek_test1 add_dependencies(paltest_fseek_test1 coreclrpal) target_link_libraries(paltest_fseek_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt index a1f350d0c2..e7900f65aa 100644 --- a/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ftell_test1 add_dependencies(paltest_ftell_test1 coreclrpal) target_link_libraries(paltest_ftell_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt index 519860b877..4c5835667c 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test1 add_dependencies(paltest_fwprintf_test1 coreclrpal) target_link_libraries(paltest_fwprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt index e604e03dff..994cd5e271 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test10 add_dependencies(paltest_fwprintf_test10 coreclrpal) target_link_libraries(paltest_fwprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt index 18be522823..a2bc58527e 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test11 add_dependencies(paltest_fwprintf_test11 coreclrpal) target_link_libraries(paltest_fwprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt index 6ea739b28f..33006f439f 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test12 add_dependencies(paltest_fwprintf_test12 coreclrpal) target_link_libraries(paltest_fwprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt index 8505ccbd82..fef3d08d51 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test13 add_dependencies(paltest_fwprintf_test13 coreclrpal) target_link_libraries(paltest_fwprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt index 548e60fdb8..6e37e4fb81 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test14 add_dependencies(paltest_fwprintf_test14 coreclrpal) target_link_libraries(paltest_fwprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt index c5b53461a7..5f1513d645 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test15 add_dependencies(paltest_fwprintf_test15 coreclrpal) target_link_libraries(paltest_fwprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt index 51af0a0d60..f77b355304 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test16 add_dependencies(paltest_fwprintf_test16 coreclrpal) target_link_libraries(paltest_fwprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt index 9ed8a390e7..5a4a58e7d3 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test17 add_dependencies(paltest_fwprintf_test17 coreclrpal) target_link_libraries(paltest_fwprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt index 3e3ba4efc7..9839b9fb35 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test18 add_dependencies(paltest_fwprintf_test18 coreclrpal) target_link_libraries(paltest_fwprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt index fbb7370ba3..e7ac859f18 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test19 add_dependencies(paltest_fwprintf_test19 coreclrpal) target_link_libraries(paltest_fwprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt index e65a396862..e589a068c0 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test2 add_dependencies(paltest_fwprintf_test2 coreclrpal) target_link_libraries(paltest_fwprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp index ecd3c513df..1e03147619 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest(convert("foo %5.2s"), convert("bar"), "foo ba"); DoWStrTest(convert("foo %-5s"), convert("bar"), "foo bar "); DoWStrTest(convert("foo %05s"), convert("bar"), "foo 00bar"); + DoWStrTest(convert("foo %s"), NULL, "foo (null)"); + DoStrTest(convert("foo %hs"), NULL, "foo (null)"); + DoWStrTest(convert("foo %ls"), NULL, "foo (null)"); + DoWStrTest(convert("foo %ws"), NULL, "foo (null)"); + DoWStrTest(convert("foo %Ls"), NULL, "foo (null)"); + DoWStrTest(convert("foo %I64s"), NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt index 53c46369de..f583d40ace 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test3 add_dependencies(paltest_fwprintf_test3 coreclrpal) target_link_libraries(paltest_fwprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp index d718a19067..ff24aa715f 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp @@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest(convert("foo %5.2S"),"bar", "foo ba"); DoStrTest(convert("foo %-5S"), "bar", "foo bar "); DoStrTest(convert("foo %05S"), "bar", "foo 00bar"); + DoStrTest(convert("foo %S"), NULL, "foo (null)"); + DoStrTest(convert("foo %hS"), NULL, "foo (null)"); + DoWStrTest(convert("foo %lS"), NULL, "foo (null)"); + DoWStrTest(convert("foo %wS"), NULL, "foo (null)"); + DoStrTest(convert("foo %LS"), NULL, "foo (null)"); + DoStrTest(convert("foo %I64S"), NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt index 9dbb46283e..166938445b 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test4 add_dependencies(paltest_fwprintf_test4 coreclrpal) target_link_libraries(paltest_fwprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp index 96fb472c3e..a894120f9a 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp @@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest(convert("%p"), NULL, "NULL", "0000000000000000", "0x0"); DoPointerTest(convert("%p"), ptr, "pointer to 0x123456", "0000000000123456", diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt index 4e72e3ca88..4611c7fbc4 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test5 add_dependencies(paltest_fwprintf_test5 coreclrpal) target_link_libraries(paltest_fwprintf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt index d57f07fafa..f692baaf11 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test6 add_dependencies(paltest_fwprintf_test6 coreclrpal) target_link_libraries(paltest_fwprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt index 314ca353e5..18b6673c8b 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test7 add_dependencies(paltest_fwprintf_test7 coreclrpal) target_link_libraries(paltest_fwprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt index e818df2eb2..dfb8814bdc 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test8 add_dependencies(paltest_fwprintf_test8 coreclrpal) target_link_libraries(paltest_fwprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt index 28b6b86921..3e08677734 100644 --- a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwprintf_test9 add_dependencies(paltest_fwprintf_test9 coreclrpal) target_link_libraries(paltest_fwprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt index 5c8b7449f2..084c1fc415 100644 --- a/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_fwrite_test1 add_dependencies(paltest_fwrite_test1 coreclrpal) target_link_libraries(paltest_fwrite_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt index 68ecaa9abb..92f6f31e17 100644 --- a/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getc_test1 add_dependencies(paltest_getc_test1 coreclrpal) target_link_libraries(paltest_getc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt index 9c52c2890e..8cb87b1190 100644 --- a/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenv_test1 add_dependencies(paltest_getenv_test1 coreclrpal) target_link_libraries(paltest_getenv_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt index 971a836239..de8bc27cdc 100644 --- a/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenv_test2 add_dependencies(paltest_getenv_test2 coreclrpal) target_link_libraries(paltest_getenv_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt index 620ccd1003..48d3b117d6 100644 --- a/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenv_test3 add_dependencies(paltest_getenv_test3 coreclrpal) target_link_libraries(paltest_getenv_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt index af65f32cbf..033f58d912 100644 --- a/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isalnum_test1 add_dependencies(paltest_isalnum_test1 coreclrpal) target_link_libraries(paltest_isalnum_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt index 82f19ad383..8033ae07f0 100644 --- a/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isalpha_test1 add_dependencies(paltest_isalpha_test1 coreclrpal) target_link_libraries(paltest_isalpha_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt index b96b7aa706..8f74b2d0cd 100644 --- a/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isdigit_test1 add_dependencies(paltest_isdigit_test1 coreclrpal) target_link_libraries(paltest_isdigit_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt index d071d4bb65..a02dc70887 100644 --- a/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_islower_test1 add_dependencies(paltest_islower_test1 coreclrpal) target_link_libraries(paltest_islower_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt index 91410a02ab..6e47a8f69d 100644 --- a/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isprint_test1 add_dependencies(paltest_isprint_test1 coreclrpal) target_link_libraries(paltest_isprint_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt index 53ad94273c..bcecac10f7 100644 --- a/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isprint_test2 add_dependencies(paltest_isprint_test2 coreclrpal) target_link_libraries(paltest_isprint_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt index c3cc525145..ee6c8f3ef3 100644 --- a/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isspace_test1 add_dependencies(paltest_isspace_test1 coreclrpal) target_link_libraries(paltest_isspace_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt index e1cfa6609d..96742792cb 100644 --- a/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isupper_test1 add_dependencies(paltest_isupper_test1 coreclrpal) target_link_libraries(paltest_isupper_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt index 4074abbe76..723a26a5b2 100644 --- a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_iswdigit_test1 add_dependencies(paltest_iswdigit_test1 coreclrpal) target_link_libraries(paltest_iswdigit_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt index d21c232133..50c6f741f9 100644 --- a/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_iswprint_test1 add_dependencies(paltest_iswprint_test1 coreclrpal) target_link_libraries(paltest_iswprint_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt index 1f9a54fb17..02f6acd72d 100644 --- a/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_iswspace_test1 add_dependencies(paltest_iswspace_test1 coreclrpal) target_link_libraries(paltest_iswspace_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt index 1da5fbaa75..301bd145d5 100644 --- a/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_iswupper_test1 add_dependencies(paltest_iswupper_test1 coreclrpal) target_link_libraries(paltest_iswupper_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt index ae55976128..6809f5a2d1 100644 --- a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_iswxdigit_test1 add_dependencies(paltest_iswxdigit_test1 coreclrpal) target_link_libraries(paltest_iswxdigit_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt index 4fd46c93d8..cfb0e91e93 100644 --- a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isxdigit_test1 add_dependencies(paltest_isxdigit_test1 coreclrpal) target_link_libraries(paltest_isxdigit_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt index 2ffb3cd641..70d1b5ee64 100644 --- a/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_labs_test1 add_dependencies(paltest_labs_test1 coreclrpal) target_link_libraries(paltest_labs_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt index 3adc3cc737..2885109b55 100644 --- a/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_llabs_test1 add_dependencies(paltest_llabs_test1 coreclrpal) target_link_libraries(paltest_llabs_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt index 698699f821..55b42585c1 100644 --- a/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_localtime_test1 add_dependencies(paltest_localtime_test1 coreclrpal) target_link_libraries(paltest_localtime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt index c8f991b997..15a45edb6a 100644 --- a/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_log_test1 add_dependencies(paltest_log_test1 coreclrpal) target_link_libraries(paltest_log_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt index 31025fbd04..17c87301e2 100644 --- a/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_log10_test1 add_dependencies(paltest_log10_test1 coreclrpal) target_link_libraries(paltest_log10_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt index b2c0835451..6f3358b865 100644 --- a/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/log10f/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_log10f_test1 add_dependencies(paltest_log10f_test1 coreclrpal) target_link_libraries(paltest_log10f_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt index 550f572bc7..2dcfdefde5 100644 --- a/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/logf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_logf_test1 add_dependencies(paltest_logf_test1 coreclrpal) target_link_libraries(paltest_logf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt index f475730973..b08685d165 100644 --- a/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_malloc_test1 add_dependencies(paltest_malloc_test1 coreclrpal) target_link_libraries(paltest_malloc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt index 663e104d0e..1b72ab8e62 100644 --- a/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_malloc_test2 add_dependencies(paltest_malloc_test2 coreclrpal) target_link_libraries(paltest_malloc_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt index 959fd2a3bc..1f6fc08568 100644 --- a/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_memchr_test1 add_dependencies(paltest_memchr_test1 coreclrpal) target_link_libraries(paltest_memchr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt index 43d8fdd7f7..24aa40a56b 100644 --- a/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_memcmp_test1 add_dependencies(paltest_memcmp_test1 coreclrpal) target_link_libraries(paltest_memcmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt index 14db0df60e..982433f7e2 100644 --- a/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_memcpy_test1 add_dependencies(paltest_memcpy_test1 coreclrpal) target_link_libraries(paltest_memcpy_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt index db6f65e48b..9794085914 100644 --- a/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_memmove_test1 add_dependencies(paltest_memmove_test1 coreclrpal) target_link_libraries(paltest_memmove_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt index bc3d6251cb..3f3c5614e0 100644 --- a/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_memset_test1 add_dependencies(paltest_memset_test1 coreclrpal) target_link_libraries(paltest_memset_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt index 3fe7bc7c46..303ce629d1 100644 --- a/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_modf_test1 add_dependencies(paltest_modf_test1 coreclrpal) target_link_libraries(paltest_modf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt index 10e5e99267..b3831c8e6d 100644 --- a/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_modff_test1 add_dependencies(paltest_modff_test1 coreclrpal) target_link_libraries(paltest_modff_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt index f94210d5b7..339b7a3ee5 100644 --- a/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pow_test1 add_dependencies(paltest_pow_test1 coreclrpal) target_link_libraries(paltest_pow_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt index 8ea040f9a4..2b8e2bcff8 100644 --- a/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/powf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_powf_test1 add_dependencies(paltest_powf_test1 coreclrpal) target_link_libraries(paltest_powf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt index 2dace14f90..0938d8fb7d 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test1 add_dependencies(paltest_printf_test1 coreclrpal) target_link_libraries(paltest_printf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt index 75e30c8599..f2a284b2a9 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test10 add_dependencies(paltest_printf_test10 coreclrpal) target_link_libraries(paltest_printf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt index 4ee12dc21d..8eb44b5e43 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test11 add_dependencies(paltest_printf_test11 coreclrpal) target_link_libraries(paltest_printf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt index 3b2e39d640..17c4a53812 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test12 add_dependencies(paltest_printf_test12 coreclrpal) target_link_libraries(paltest_printf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt index b6af021d48..13b0f63188 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test13 add_dependencies(paltest_printf_test13 coreclrpal) target_link_libraries(paltest_printf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt index 5a6cf8a180..22fd9ab76e 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test14 add_dependencies(paltest_printf_test14 coreclrpal) target_link_libraries(paltest_printf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt index b1466a387d..cc350a5e5d 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test15 add_dependencies(paltest_printf_test15 coreclrpal) target_link_libraries(paltest_printf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt index c81da10ec9..a61b5a0bd6 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test16 add_dependencies(paltest_printf_test16 coreclrpal) target_link_libraries(paltest_printf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt index 9d40e54ca6..f8c1754d87 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test17 add_dependencies(paltest_printf_test17 coreclrpal) target_link_libraries(paltest_printf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt index 6ab11f4be1..c83c096e97 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test18 add_dependencies(paltest_printf_test18 coreclrpal) target_link_libraries(paltest_printf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt index f022938e32..4d3fe5f794 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test19 add_dependencies(paltest_printf_test19 coreclrpal) target_link_libraries(paltest_printf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt index e92b6b09f3..d45c7727c9 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test2 add_dependencies(paltest_printf_test2 coreclrpal) target_link_libraries(paltest_printf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp index e766ef4a90..1c61b1d86d 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt index fcfd779a0c..b6d9ce2e63 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test3 add_dependencies(paltest_printf_test3 coreclrpal) target_link_libraries(paltest_printf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp index 5cc530948c..79fe7213b3 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp @@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt index 7311bbea69..621c103cc7 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test4 add_dependencies(paltest_printf_test4 coreclrpal) target_link_libraries(paltest_printf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp index bcdc201d4f..7b0178cd29 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp @@ -29,7 +29,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest("%p", NULL, "NULL", "0000000000000000"); DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); diff --git a/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt index bfe185c44f..73e8b7dbff 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test5 add_dependencies(paltest_printf_test5 coreclrpal) target_link_libraries(paltest_printf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt index 842ebfedc6..07639c6330 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test6 add_dependencies(paltest_printf_test6 coreclrpal) target_link_libraries(paltest_printf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt index 16e39198ba..72bc2858b2 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test7 add_dependencies(paltest_printf_test7 coreclrpal) target_link_libraries(paltest_printf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt index 4a40fee6d9..78ce601cac 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test8 add_dependencies(paltest_printf_test8 coreclrpal) target_link_libraries(paltest_printf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt index df8f75d2fd..dfc2a8316c 100644 --- a/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_printf_test9 add_dependencies(paltest_printf_test9 coreclrpal) target_link_libraries(paltest_printf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt index ff215b8dc6..f41f4099f4 100644 --- a/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_qsort_test1 add_dependencies(paltest_qsort_test1 coreclrpal) target_link_libraries(paltest_qsort_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt index cdd9642779..16e5c44220 100644 --- a/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_qsort_test2 add_dependencies(paltest_qsort_test2 coreclrpal) target_link_libraries(paltest_qsort_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt index 6728f402ff..0afb6504c4 100644 --- a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rand_srand_test1 add_dependencies(paltest_rand_srand_test1 coreclrpal) target_link_libraries(paltest_rand_srand_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt index 62830a0fe8..0c263d5b5b 100644 --- a/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_realloc_test1 add_dependencies(paltest_realloc_test1 coreclrpal) target_link_libraries(paltest_realloc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt index 74a0e78f52..c46aaeccb8 100644 --- a/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sin_test1 add_dependencies(paltest_sin_test1 coreclrpal) target_link_libraries(paltest_sin_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt index 0651b43d1d..9e03130464 100644 --- a/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sinf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sinf_test1 add_dependencies(paltest_sinf_test1 coreclrpal) target_link_libraries(paltest_sinf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt index b0101ba808..1c99bfa890 100644 --- a/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sinh_test1 add_dependencies(paltest_sinh_test1 coreclrpal) target_link_libraries(paltest_sinh_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt index 72cce43460..60208d4e1c 100644 --- a/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sinhf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sinhf_test1 add_dependencies(paltest_sinhf_test1 coreclrpal) target_link_libraries(paltest_sinhf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt index ee0d90fe7f..5de43c73ac 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test1 add_dependencies(paltest_sprintf_test1 coreclrpal) target_link_libraries(paltest_sprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt index 1efad19dee..54bc9c08dd 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test10 add_dependencies(paltest_sprintf_test10 coreclrpal) target_link_libraries(paltest_sprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt index f2f4da694c..6eac95623b 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test11 add_dependencies(paltest_sprintf_test11 coreclrpal) target_link_libraries(paltest_sprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt index 361e91f9ae..a49975993f 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test12 add_dependencies(paltest_sprintf_test12 coreclrpal) target_link_libraries(paltest_sprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt index d08e13b2ba..4d66713fb8 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test13 add_dependencies(paltest_sprintf_test13 coreclrpal) target_link_libraries(paltest_sprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt index 60ac2922d7..ce41b8a95c 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test14 add_dependencies(paltest_sprintf_test14 coreclrpal) target_link_libraries(paltest_sprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt index 57bba40e6c..d20c4d07e9 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test15 add_dependencies(paltest_sprintf_test15 coreclrpal) target_link_libraries(paltest_sprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt index fc93e1a67d..2ca1ffd2ef 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test16 add_dependencies(paltest_sprintf_test16 coreclrpal) target_link_libraries(paltest_sprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt index dc5ff2bb30..0c17cbfc34 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test17 add_dependencies(paltest_sprintf_test17 coreclrpal) target_link_libraries(paltest_sprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt index f6e1b09efa..afc3e8f01c 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test18 add_dependencies(paltest_sprintf_test18 coreclrpal) target_link_libraries(paltest_sprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt index 757288b694..7553aede95 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test19 add_dependencies(paltest_sprintf_test19 coreclrpal) target_link_libraries(paltest_sprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt index d569263da4..a4b0b007bc 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test2 add_dependencies(paltest_sprintf_test2 coreclrpal) target_link_libraries(paltest_sprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp index 990f4f04a8..a3eb71dd1c 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test2/test2.cpp @@ -40,6 +40,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt index 518c3f847a..825c79c03b 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test3 add_dependencies(paltest_sprintf_test3 coreclrpal) target_link_libraries(paltest_sprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp index c0dc8e1716..dd6e590263 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test3/test3.cpp @@ -39,6 +39,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt index 260def44aa..0bde37c239 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test4 add_dependencies(paltest_sprintf_test4 coreclrpal) target_link_libraries(paltest_sprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp index 46115ad5ae..bb3a6d818c 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test4/test4.cpp @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest("%p", NULL, "NULL", "0000000000000000"); DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt index fce1f204fd..495c256b4d 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test6 add_dependencies(paltest_sprintf_test6 coreclrpal) target_link_libraries(paltest_sprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt index 72a831ec89..2fabe0b659 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test7 add_dependencies(paltest_sprintf_test7 coreclrpal) target_link_libraries(paltest_sprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt index c9522c1c9d..cb67e89df6 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test8 add_dependencies(paltest_sprintf_test8 coreclrpal) target_link_libraries(paltest_sprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt index e76fed4784..005a23d4e6 100644 --- a/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sprintf_s/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sprintf_test9 add_dependencies(paltest_sprintf_test9 coreclrpal) target_link_libraries(paltest_sprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt index d4aefe6ca8..4680e2359b 100644 --- a/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sqrt_test1 add_dependencies(paltest_sqrt_test1 coreclrpal) target_link_libraries(paltest_sqrt_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt index 96b6ffa998..51b76aeacd 100644 --- a/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sqrtf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sqrtf_test1 add_dependencies(paltest_sqrtf_test1 coreclrpal) target_link_libraries(paltest_sqrtf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt index 97b8f570e3..82a0e703bd 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test1 add_dependencies(paltest_sscanf_test1 coreclrpal) target_link_libraries(paltest_sscanf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt index afda216c6b..c85e1b031f 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test10 add_dependencies(paltest_sscanf_test10 coreclrpal) target_link_libraries(paltest_sscanf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt index c8f98aeeef..2c7f0e29e9 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test11 add_dependencies(paltest_sscanf_test11 coreclrpal) target_link_libraries(paltest_sscanf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt index 0ecedc3285..af2355643e 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test12 add_dependencies(paltest_sscanf_test12 coreclrpal) target_link_libraries(paltest_sscanf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt index 4566ec3338..7f9b3a1658 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test13 add_dependencies(paltest_sscanf_test13 coreclrpal) target_link_libraries(paltest_sscanf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt index 557acf5bf8..c195b12ca7 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test14 add_dependencies(paltest_sscanf_test14 coreclrpal) target_link_libraries(paltest_sscanf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt index efde5c4a21..0c8967d821 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test15 add_dependencies(paltest_sscanf_test15 coreclrpal) target_link_libraries(paltest_sscanf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt index 6757b0d78a..10a6cc8a4e 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test16 add_dependencies(paltest_sscanf_test16 coreclrpal) target_link_libraries(paltest_sscanf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt index 8ea4d5e3f6..84832a848f 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test17 add_dependencies(paltest_sscanf_test17 coreclrpal) target_link_libraries(paltest_sscanf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt index 4e36223a1d..a79492bf4f 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test2 add_dependencies(paltest_sscanf_test2 coreclrpal) target_link_libraries(paltest_sscanf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt index 053a96ca0f..ba1a5286a4 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test3 add_dependencies(paltest_sscanf_test3 coreclrpal) target_link_libraries(paltest_sscanf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt index ae04bfef57..456fce018f 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test4 add_dependencies(paltest_sscanf_test4 coreclrpal) target_link_libraries(paltest_sscanf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt index 33dcaffec3..b4075037a4 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test5 add_dependencies(paltest_sscanf_test5 coreclrpal) target_link_libraries(paltest_sscanf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt index 1dd23c3cb1..f9815123d7 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test6 add_dependencies(paltest_sscanf_test6 coreclrpal) target_link_libraries(paltest_sscanf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt index 015a27b776..ba2913626e 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test7 add_dependencies(paltest_sscanf_test7 coreclrpal) target_link_libraries(paltest_sscanf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt index aa41ab42a6..2437679c04 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test8 add_dependencies(paltest_sscanf_test8 coreclrpal) target_link_libraries(paltest_sscanf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt index b631fd40ea..a3df87279f 100644 --- a/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/sscanf_s/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sscanf_test9 add_dependencies(paltest_sscanf_test9 coreclrpal) target_link_libraries(paltest_sscanf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt index fd62627db6..29d25f10e6 100644 --- a/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strcat_test1 add_dependencies(paltest_strcat_test1 coreclrpal) target_link_libraries(paltest_strcat_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt index f3ffe3bc15..507d2e040f 100644 --- a/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strchr_test1 add_dependencies(paltest_strchr_test1 coreclrpal) target_link_libraries(paltest_strchr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt index 3b0f89c2a5..6a0e9f13f6 100644 --- a/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strcmp_test1 add_dependencies(paltest_strcmp_test1 coreclrpal) target_link_libraries(paltest_strcmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt index 4369d37a40..cecb086030 100644 --- a/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strcpy_test1 add_dependencies(paltest_strcpy_test1 coreclrpal) target_link_libraries(paltest_strcpy_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt index 717e18f0e9..4b1ea67893 100644 --- a/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strcspn_test1 add_dependencies(paltest_strcspn_test1 coreclrpal) target_link_libraries(paltest_strcspn_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt index 4afeb598aa..42cecf4aaf 100644 --- a/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strlen_test1 add_dependencies(paltest_strlen_test1 coreclrpal) target_link_libraries(paltest_strlen_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt index f8080ecdc2..bf2363387c 100644 --- a/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strncat_test1 add_dependencies(paltest_strncat_test1 coreclrpal) target_link_libraries(paltest_strncat_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt index 34b53e294d..b76ff5eeab 100644 --- a/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strncmp_test1 add_dependencies(paltest_strncmp_test1 coreclrpal) target_link_libraries(paltest_strncmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt index fb737c8c59..9b8ed3ff83 100644 --- a/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strncpy_test1 add_dependencies(paltest_strncpy_test1 coreclrpal) target_link_libraries(paltest_strncpy_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt index 9e76436e01..239b36c946 100644 --- a/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strpbrk_test1 add_dependencies(paltest_strpbrk_test1 coreclrpal) target_link_libraries(paltest_strpbrk_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt index bb6916038d..19bdd4e1d0 100644 --- a/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strrchr_test1 add_dependencies(paltest_strrchr_test1 coreclrpal) target_link_libraries(paltest_strrchr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt index c72fd0fa9a..324690034d 100644 --- a/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strspn_test1 add_dependencies(paltest_strspn_test1 coreclrpal) target_link_libraries(paltest_strspn_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt index 004b9a5658..b8fe41809f 100644 --- a/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strstr_test1 add_dependencies(paltest_strstr_test1 coreclrpal) target_link_libraries(paltest_strstr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt index 09884f32e6..1a2df225bd 100644 --- a/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strtod_test1 add_dependencies(paltest_strtod_test1 coreclrpal) target_link_libraries(paltest_strtod_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt index 8729cc5a1c..581e4de3e7 100644 --- a/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strtod_test2 add_dependencies(paltest_strtod_test2 coreclrpal) target_link_libraries(paltest_strtod_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt index 422c4e96b5..098a6640f1 100644 --- a/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strtok_test1 add_dependencies(paltest_strtok_test1 coreclrpal) target_link_libraries(paltest_strtok_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt index 009e85fb11..bdf4497cae 100644 --- a/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_strtoul_test1 add_dependencies(paltest_strtoul_test1 coreclrpal) target_link_libraries(paltest_strtoul_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt index cafb9536b0..8fe1cb60ac 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory(test19) add_subdirectory(test2) add_subdirectory(test3) add_subdirectory(test4) -add_subdirectory(test5) add_subdirectory(test6) add_subdirectory(test7) add_subdirectory(test8) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h b/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h index 6f4c914a82..210b12ec7a 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h +++ b/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h @@ -18,7 +18,7 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, param); + swprintf_s(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(checkstr) * 2 + 2) != 0) { @@ -33,7 +33,7 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, param); + swprintf_s(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(checkstr) * 2 + 2) != 0) { @@ -48,7 +48,7 @@ void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, param); + swprintf_s(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr1, wcslen(checkstr1)*2 + 2) != 0) { Fail("ERROR: failed to insert pointer to %#p into \"%s\"\n" @@ -57,51 +57,11 @@ void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1) } } -void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) -{ - WCHAR buf[512] = { 0 }; - int n = -1; - - swprintf(buf, formatstr, &n); - - if (n != param) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %d\n", - param, n); - } - - if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0) - { - Fail("ERROR: Expected \"%s\" got \"%s\".\n", - convertC(checkstr), convertC(buf)); - } -} - -void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr) -{ - WCHAR buf[256] = { 0 }; - short int n = -1; - - swprintf(buf, formatstr, &n); - - if (n != param) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %d\n", - param, n); - } - - if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0) - { - Fail("ERROR: Expected \"%s\" got \"%s\".\n", - convertC(checkstr), convertC(buf)); - } -} - void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, param); + swprintf_s(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0) { Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n" @@ -114,7 +74,7 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, param); + swprintf_s(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(checkstr)*2 + 2) != 0) { Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n" @@ -127,7 +87,7 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, value); + swprintf_s(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr, wcslen(checkstr)* 2 + 2) != 0) { Fail("ERROR: failed to insert %#x into \"%s\"\n" @@ -141,7 +101,7 @@ void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc, { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, param); + swprintf_s(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr1, wcslen(checkstr1)*2 + 2) != 0) { Fail("ERROR: failed to insert %s into \"%s\"\n" @@ -155,7 +115,7 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, { WCHAR buf[256] = { 0 }; - swprintf(buf, formatstr, value); + swprintf_s(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr1, wcslen(checkstr1)*2 + 2) != 0 && memcmp(buf, checkstr2, wcslen(checkstr2)*2 + 2) != 0) { @@ -171,7 +131,7 @@ void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, { WCHAR buf[256]; - swprintf(buf, formatstr, precision, param); + swprintf_s(buf, _countof(buf), formatstr, precision, param); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 && memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0) { @@ -187,7 +147,7 @@ void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double para { WCHAR buf[256]; - swprintf(buf, formatstr, precision, param); + swprintf_s(buf, _countof(buf), formatstr, precision, param); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 && memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0) { diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt index c9be8c3347..f89cfb6fd6 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test1 add_dependencies(paltest_swprintf_test1 coreclrpal) target_link_libraries(paltest_swprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp index 626040d9f7..c47d7d5202 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp @@ -31,7 +31,7 @@ int __cdecl main(int argc, char *argv[]) } checkstr = convert("hello world"); - swprintf(buf, convert("hello world")); + swprintf_s(buf, _countof(buf), convert("hello world")); if (memcmp(checkstr, buf, wcslen(checkstr)*2+2) != 0) { diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt index 222108393b..70581d16a9 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test10 add_dependencies(paltest_swprintf_test10 coreclrpal) target_link_libraries(paltest_swprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt index 96222a5b2a..4d51917540 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test11 add_dependencies(paltest_swprintf_test11 coreclrpal) target_link_libraries(paltest_swprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt index 1ffe620fed..57cce1679a 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test12 add_dependencies(paltest_swprintf_test12 coreclrpal) target_link_libraries(paltest_swprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt index 8699589ec9..5b6c635858 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test13 add_dependencies(paltest_swprintf_test13 coreclrpal) target_link_libraries(paltest_swprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt index 2a4b84805c..88334d67a5 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test14 add_dependencies(paltest_swprintf_test14 coreclrpal) target_link_libraries(paltest_swprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt index 22382bce5f..5387060b2d 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test15 add_dependencies(paltest_swprintf_test15 coreclrpal) target_link_libraries(paltest_swprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt index 462f0806cd..4f66beaa24 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test16 add_dependencies(paltest_swprintf_test16 coreclrpal) target_link_libraries(paltest_swprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt index c5b4d44593..ace16a18f1 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test17 add_dependencies(paltest_swprintf_test17 coreclrpal) target_link_libraries(paltest_swprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt index 6cdf576966..ddce256260 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test18 add_dependencies(paltest_swprintf_test18 coreclrpal) target_link_libraries(paltest_swprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt index 334b7b4fa1..8d48ce438c 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test19 add_dependencies(paltest_swprintf_test19 coreclrpal) target_link_libraries(paltest_swprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp index c0346036cd..0967bc8f4b 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp @@ -33,14 +33,6 @@ int __cdecl main(int argc, char *argv[]) convert("ba"), convert("ba")); DoArgumentPrecTest(convert("%.*S"), 2, (void*)"bar", "bar", convert("ba"), convert("ba")); - DoArgumentPrecTest(convert("%.*n"), 3, (void*)&n, "pointer to int", convert(""), - convert("")); - if (n != 0) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %X\n", - 0, n); - } - DoArgumentPrecTest(convert("%.*c"), 0, (void*)'a', "a", convert("a"), convert("a")); DoArgumentPrecTest(convert("%.*c"), 4, (void*)'a', "a", convert("a"), diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt index af2b13e4c7..fcf7136797 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test2 add_dependencies(paltest_swprintf_test2 coreclrpal) target_link_libraries(paltest_swprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp index deffd3edd7..1c2f420fe9 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp @@ -40,6 +40,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest(convert("foo %5.2s"), convert("bar"), convert("foo ba")); DoWStrTest(convert("foo %-5s"), convert("bar"), convert("foo bar ")); DoWStrTest(convert("foo %05s"), convert("bar"), convert("foo 00bar")); + DoWStrTest(convert("foo %s"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hs"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ws"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %Ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %I64s"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt index 14b81f4ac8..cc79c2d1d1 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test3 add_dependencies(paltest_swprintf_test3 coreclrpal) target_link_libraries(paltest_swprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp index 42875c0640..8c6c38c96b 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest(convert("foo %5.2S"),"bar", convert("foo ba")); DoStrTest(convert("foo %-5S"), "bar", convert("foo bar ")); DoStrTest(convert("foo %05S"), "bar", convert("foo 00bar")); + DoStrTest(convert("foo %S"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %lS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %wS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %LS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %I64S"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; } diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt index e153e6b02f..c5d92462a6 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test4 add_dependencies(paltest_swprintf_test4 coreclrpal) target_link_libraries(paltest_swprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp index 02cc3f9005..9a68bdaac3 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp @@ -33,7 +33,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest(convert("%p"), NULL, convert("0000000000000000")); DoPointerTest(convert("%p"), ptr, convert("0000000000123456")); diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt deleted file mode 100644 index 967ccbb992..0000000000 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test5.cpp -) - -add_executable(paltest_swprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_swprintf_test5 coreclrpal) - -target_link_libraries(paltest_swprintf_test5 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp deleted file mode 100644 index e85adc120e..0000000000 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*============================================================================ -** -** Source: test5.c -** -** Purpose:Tests swprintf with the count specifier -** -** -**==========================================================================*/ - - - -#include -#include "../swprintf.h" - -/* - * Uses memcmp & wcslen - */ - -int __cdecl main(int argc, char *argv[]) -{ - WCHAR *longStr; - WCHAR *longResult; - - if (PAL_Initialize(argc, argv) != 0) - { - return FAIL; - } - - longStr = - convert("really-long-string-that-just-keeps-going-on-and-on-and-on.." - "..................useless-filler.................................." - "..................useless-filler.................................." - "..................useless-filler.................................." - "%n bar"); - longResult = - convert("really-long-string-that-just-keeps-going-on-and-on-and-on.." - "..................useless-filler.................................." - "..................useless-filler.................................." - "..................useless-filler.................................." - " bar"); - - DoCountTest(convert("foo %n bar"), 4, convert("foo bar")); - DoCountTest(longStr, 257, longResult); - DoCountTest(convert("fo%n bar"), 2, convert("fo bar")); - DoCountTest(convert("%n"), 0, convert("")); - DoCountTest(convert("foo %#n bar"), 4, convert("foo bar")); - DoCountTest(convert("foo % n bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %+n bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %-n bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %0n bar"), 4, convert("foo bar")); - DoShortCountTest(convert("foo %hn bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %ln bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %Ln bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %I64n bar"), 4, convert("foo bar")); - DoCountTest(convert("foo %20.3n bar"), 4, convert("foo bar")); - - PAL_Terminate(); - - free(longStr); - free(longResult); - - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat deleted file mode 100644 index ef1f1ffc5a..0000000000 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/testinfo.dat +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = swprintf -Name = Positive Test for swprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests swprintf with the count specifier diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt index 806211a992..044029dd62 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test6 add_dependencies(paltest_swprintf_test6 coreclrpal) target_link_libraries(paltest_swprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt index cf563799d9..3ee7139ec7 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test7 add_dependencies(paltest_swprintf_test7 coreclrpal) target_link_libraries(paltest_swprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt index e8fcf66157..55ac85c164 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test8 add_dependencies(paltest_swprintf_test8 coreclrpal) target_link_libraries(paltest_swprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt index c616348766..7d7f524f65 100644 --- a/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swprintf_test9 add_dependencies(paltest_swprintf_test9 coreclrpal) target_link_libraries(paltest_swprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt index 44b8939248..ae2366e812 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test1 add_dependencies(paltest_swscanf_test1 coreclrpal) target_link_libraries(paltest_swscanf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt index 27d42114a9..313b4f4693 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test10 add_dependencies(paltest_swscanf_test10 coreclrpal) target_link_libraries(paltest_swscanf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt index 1ca9224ec0..79703e598a 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test11 add_dependencies(paltest_swscanf_test11 coreclrpal) target_link_libraries(paltest_swscanf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt index 44d70f47ae..8c6754f442 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test12 add_dependencies(paltest_swscanf_test12 coreclrpal) target_link_libraries(paltest_swscanf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt index add0cbfe18..8072390bde 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test13 add_dependencies(paltest_swscanf_test13 coreclrpal) target_link_libraries(paltest_swscanf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt index 126e087b1c..723b68f449 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test14 add_dependencies(paltest_swscanf_test14 coreclrpal) target_link_libraries(paltest_swscanf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt index 7c2da2bdf8..e0b7fd8d28 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test15 add_dependencies(paltest_swscanf_test15 coreclrpal) target_link_libraries(paltest_swscanf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt index ba28c4dc2f..a593fd119e 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test16 add_dependencies(paltest_swscanf_test16 coreclrpal) target_link_libraries(paltest_swscanf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt index 225ce868ed..890d9a4e6e 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test17 add_dependencies(paltest_swscanf_test17 coreclrpal) target_link_libraries(paltest_swscanf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt index 15411ecf21..e6d17b3855 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test2 add_dependencies(paltest_swscanf_test2 coreclrpal) target_link_libraries(paltest_swscanf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt index 927026107a..72be68114b 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test3 add_dependencies(paltest_swscanf_test3 coreclrpal) target_link_libraries(paltest_swscanf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt index eec701645b..3581ec1413 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test4 add_dependencies(paltest_swscanf_test4 coreclrpal) target_link_libraries(paltest_swscanf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt index 3f022db16c..8ade17ac6e 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test5 add_dependencies(paltest_swscanf_test5 coreclrpal) target_link_libraries(paltest_swscanf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt index c55666d95c..d43cc30a7f 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test6 add_dependencies(paltest_swscanf_test6 coreclrpal) target_link_libraries(paltest_swscanf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt index adb0abe80d..3ac9f9d630 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test7 add_dependencies(paltest_swscanf_test7 coreclrpal) target_link_libraries(paltest_swscanf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt index a69c552337..4e312edc17 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test8 add_dependencies(paltest_swscanf_test8 coreclrpal) target_link_libraries(paltest_swscanf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt index 70a9fe2064..ca21283476 100644 --- a/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_swscanf_test9 add_dependencies(paltest_swscanf_test9 coreclrpal) target_link_libraries(paltest_swscanf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt index cea661f2bb..64b90265b2 100644 --- a/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tan_test1 add_dependencies(paltest_tan_test1 coreclrpal) target_link_libraries(paltest_tan_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt index cd588ea23e..6883041a22 100644 --- a/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/tanf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tanf_test1 add_dependencies(paltest_tanf_test1 coreclrpal) target_link_libraries(paltest_tanf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt index 9fe926d441..f8cb99c264 100644 --- a/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tanh_test1 add_dependencies(paltest_tanh_test1 coreclrpal) target_link_libraries(paltest_tanh_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt index fd0af2a46f..83e2612fa8 100644 --- a/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/tanhf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tanhf_test1 add_dependencies(paltest_tanhf_test1 coreclrpal) target_link_libraries(paltest_tanhf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt index 64df144557..d3605e8c71 100644 --- a/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_time_test1 add_dependencies(paltest_time_test1 coreclrpal) target_link_libraries(paltest_time_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt index 214a509010..90a3b98825 100644 --- a/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tolower_test1 add_dependencies(paltest_tolower_test1 coreclrpal) target_link_libraries(paltest_tolower_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt index 3dd536c590..2d64731183 100644 --- a/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_toupper_test1 add_dependencies(paltest_toupper_test1 coreclrpal) target_link_libraries(paltest_toupper_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt index 77a46344d4..e5da389dee 100644 --- a/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_towlower_test1 add_dependencies(paltest_towlower_test1 coreclrpal) target_link_libraries(paltest_towlower_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt index 6a2f813cc9..a09dca8f84 100644 --- a/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_towupper_test1 add_dependencies(paltest_towupper_test1 coreclrpal) target_link_libraries(paltest_towupper_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt index 0286f99b77..9db3fce592 100644 --- a/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ungetc_test1 add_dependencies(paltest_ungetc_test1 coreclrpal) target_link_libraries(paltest_ungetc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt index 0710074bd0..f4a2c733de 100644 --- a/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_ungetc_test2 add_dependencies(paltest_ungetc_test2 coreclrpal) target_link_libraries(paltest_ungetc_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt index fcff4a2074..138615a400 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test1 add_dependencies(paltest_vfprintf_test1 coreclrpal) target_link_libraries(paltest_vfprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt index 97c7b167ab..824d1466aa 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test10 add_dependencies(paltest_vfprintf_test10 coreclrpal) target_link_libraries(paltest_vfprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt index 9250eb957d..492e8502a5 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test11 add_dependencies(paltest_vfprintf_test11 coreclrpal) target_link_libraries(paltest_vfprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt index 53d3488b4a..5837e1f2ba 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test12 add_dependencies(paltest_vfprintf_test12 coreclrpal) target_link_libraries(paltest_vfprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt index c35813b420..2a9ec0b6b5 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test13 add_dependencies(paltest_vfprintf_test13 coreclrpal) target_link_libraries(paltest_vfprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt index bd91f509b5..21c90bf7a6 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test14 add_dependencies(paltest_vfprintf_test14 coreclrpal) target_link_libraries(paltest_vfprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt index 30003b82f8..7ec560b77e 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test15 add_dependencies(paltest_vfprintf_test15 coreclrpal) target_link_libraries(paltest_vfprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt index a287f120a0..8dac2ede06 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test16 add_dependencies(paltest_vfprintf_test16 coreclrpal) target_link_libraries(paltest_vfprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt index cf1afd9d2d..1708518678 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test17 add_dependencies(paltest_vfprintf_test17 coreclrpal) target_link_libraries(paltest_vfprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt index 143eade9b3..7c40561abf 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test18 add_dependencies(paltest_vfprintf_test18 coreclrpal) target_link_libraries(paltest_vfprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt index 452d929b7d..2a985eb433 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test19 add_dependencies(paltest_vfprintf_test19 coreclrpal) target_link_libraries(paltest_vfprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt index b18fb712c6..c374fa6e22 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test2 add_dependencies(paltest_vfprintf_test2 coreclrpal) target_link_libraries(paltest_vfprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp index d01117f047..0228734525 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoStrTest("foo %ls", NULL, "foo (null)"); + DoStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt index a8f7eb1991..a618fc9b74 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test3 add_dependencies(paltest_vfprintf_test3 coreclrpal) target_link_libraries(paltest_vfprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp index 0081daa426..879446f851 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp @@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt index 60c31693a5..941bade25e 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test4 add_dependencies(paltest_vfprintf_test4 coreclrpal) target_link_libraries(paltest_vfprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp index d24f08d6e0..75d11f641c 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp @@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest("%p", NULL, "NULL", "0000000000000000"); DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt index 5f516fec6a..6089352834 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test5 add_dependencies(paltest_vfprintf_test5 coreclrpal) target_link_libraries(paltest_vfprintf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt index 7f0cc710af..77c2bb17d5 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test6 add_dependencies(paltest_vfprintf_test6 coreclrpal) target_link_libraries(paltest_vfprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt index a2cd9a2e8f..de00105386 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test7 add_dependencies(paltest_vfprintf_test7 coreclrpal) target_link_libraries(paltest_vfprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt index a7b20ee43e..3129aeb185 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test8 add_dependencies(paltest_vfprintf_test8 coreclrpal) target_link_libraries(paltest_vfprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt index 242b635f93..9cfaa584e8 100644 --- a/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vfprintf_test9 add_dependencies(paltest_vfprintf_test9 coreclrpal) target_link_libraries(paltest_vfprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt index 9d866e16a2..db1d273da9 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test1 add_dependencies(paltest_vprintf_test1 coreclrpal) target_link_libraries(paltest_vprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt index 4ed04b46c6..89cd486f13 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test10 add_dependencies(paltest_vprintf_test10 coreclrpal) target_link_libraries(paltest_vprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt index 5dc3c6dc69..a91ea25b7b 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test11 add_dependencies(paltest_vprintf_test11 coreclrpal) target_link_libraries(paltest_vprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt index a8104296c4..0e3c5c9d0d 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test12 add_dependencies(paltest_vprintf_test12 coreclrpal) target_link_libraries(paltest_vprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt index df98081ed7..877387f730 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test13 add_dependencies(paltest_vprintf_test13 coreclrpal) target_link_libraries(paltest_vprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt index b903d4e241..8dcc4c97fe 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test14 add_dependencies(paltest_vprintf_test14 coreclrpal) target_link_libraries(paltest_vprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt index 659ed9cb44..7c050494ff 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test15 add_dependencies(paltest_vprintf_test15 coreclrpal) target_link_libraries(paltest_vprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt index b2f7fe8b78..2280f66960 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test16 add_dependencies(paltest_vprintf_test16 coreclrpal) target_link_libraries(paltest_vprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt index 76cfc9ad06..99c3adf0a6 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test17 add_dependencies(paltest_vprintf_test17 coreclrpal) target_link_libraries(paltest_vprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt index 633fb7ee51..88c81e3a91 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test18 add_dependencies(paltest_vprintf_test18 coreclrpal) target_link_libraries(paltest_vprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt index 1a6256ad0b..59da1ea113 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test19 add_dependencies(paltest_vprintf_test19 coreclrpal) target_link_libraries(paltest_vprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt index 41e2073477..c89c81e0ee 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test2 add_dependencies(paltest_vprintf_test2 coreclrpal) target_link_libraries(paltest_vprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp index 4d9c9bc6f5..72b79e5969 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt index 8570666b11..0e69b53718 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test3 add_dependencies(paltest_vprintf_test3 coreclrpal) target_link_libraries(paltest_vprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp index 5376c56b76..66cd509d94 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp @@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt index 06b582b5ee..a06c2b7570 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test4 add_dependencies(paltest_vprintf_test4 coreclrpal) target_link_libraries(paltest_vprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp index 3b66cde22e..2cbdb35cc1 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp @@ -32,7 +32,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest("%p", NULL, "NULL", "0000000000000000"); DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt index 3a1828a28c..0124cc3b36 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test5 add_dependencies(paltest_vprintf_test5 coreclrpal) target_link_libraries(paltest_vprintf_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt index 2dac7703e6..b25f46d6c8 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test6 add_dependencies(paltest_vprintf_test6 coreclrpal) target_link_libraries(paltest_vprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt index 5a520045a9..b24e241cb2 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test7 add_dependencies(paltest_vprintf_test7 coreclrpal) target_link_libraries(paltest_vprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt index 18e4e3a0c9..d7b4b0150e 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test8 add_dependencies(paltest_vprintf_test8 coreclrpal) target_link_libraries(paltest_vprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt index 8bcbe81f51..b9fd6106b8 100644 --- a/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vprintf_test9 add_dependencies(paltest_vprintf_test9 coreclrpal) target_link_libraries(paltest_vprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt index cafb9536b0..8fe1cb60ac 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory(test19) add_subdirectory(test2) add_subdirectory(test3) add_subdirectory(test4) -add_subdirectory(test5) add_subdirectory(test6) add_subdirectory(test7) add_subdirectory(test8) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt index 6861157c1b..34d8ad9f9b 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test1 add_dependencies(paltest_vsprintf_test1 coreclrpal) target_link_libraries(paltest_vsprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp index 2007fefc5b..18c8c0ea1a 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp @@ -29,7 +29,7 @@ int __cdecl main(int argc, char *argv[]) return(FAIL); } - testvsp(buf, "hello world"); + testvsp(buf, _countof(buf), "hello world"); if (memcmp(checkstr, buf, strlen(checkstr)+1) != 0) { @@ -37,8 +37,8 @@ int __cdecl main(int argc, char *argv[]) checkstr, 256, buf); } - testvsp(buf, "xxxxxxxxxxxxxxxxx"); - ret = testvsp(buf, "hello world"); + testvsp(buf, _countof(buf), "xxxxxxxxxxxxxxxxx"); + ret = testvsp(buf, _countof(buf), "hello world"); if (ret != strlen(checkstr)) { diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt index 6f535a5098..3b0477a2c6 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test10 add_dependencies(paltest_vsprintf_test10 coreclrpal) target_link_libraries(paltest_vsprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt index 3fa628f77d..723fa6b7f2 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test11 add_dependencies(paltest_vsprintf_test11 coreclrpal) target_link_libraries(paltest_vsprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt index f34f76abc5..b58d47edd7 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test12 add_dependencies(paltest_vsprintf_test12 coreclrpal) target_link_libraries(paltest_vsprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt index df23693f10..33ea479374 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test13 add_dependencies(paltest_vsprintf_test13 coreclrpal) target_link_libraries(paltest_vsprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt index 394b5ab97c..b1a078498b 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test14 add_dependencies(paltest_vsprintf_test14 coreclrpal) target_link_libraries(paltest_vsprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt index 4793b45663..b6642eddba 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test15 add_dependencies(paltest_vsprintf_test15 coreclrpal) target_link_libraries(paltest_vsprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt index 6a0a52ddf7..c587798c62 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test16 add_dependencies(paltest_vsprintf_test16 coreclrpal) target_link_libraries(paltest_vsprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt index 4e220dab77..edc5b334d1 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test17 add_dependencies(paltest_vsprintf_test17 coreclrpal) target_link_libraries(paltest_vsprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt index 4dd68c2987..c9f20d5d52 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test18 add_dependencies(paltest_vsprintf_test18 coreclrpal) target_link_libraries(paltest_vsprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt index 3156a59a15..886f867de0 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test19 add_dependencies(paltest_vsprintf_test19 coreclrpal) target_link_libraries(paltest_vsprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt index 210224f0f1..c9fca91c19 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test2 add_dependencies(paltest_vsprintf_test2 coreclrpal) target_link_libraries(paltest_vsprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp index fbd4b41068..fc9163e976 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp @@ -36,6 +36,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest("foo %5.2s", "bar", "foo ba"); DoStrTest("foo %-5s", "bar", "foo bar "); DoStrTest("foo %05s", "bar", "foo 00bar"); + DoStrTest("foo %s", NULL, "foo (null)"); + DoStrTest("foo %hs", NULL, "foo (null)"); + DoWStrTest("foo %ls", NULL, "foo (null)"); + DoWStrTest("foo %ws", NULL, "foo (null)"); + DoStrTest("foo %Ls", NULL, "foo (null)"); + DoStrTest("foo %I64s", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt index 5581051f9f..7e45989685 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test3 add_dependencies(paltest_vsprintf_test3 coreclrpal) target_link_libraries(paltest_vsprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp index 742370ebe9..4656bf3a92 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp @@ -37,6 +37,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest("foo %5.2S", convert("bar"), "foo ba"); DoWStrTest("foo %-5S", convert("bar"), "foo bar "); DoWStrTest("foo %05S", convert("bar"), "foo 00bar"); + DoWStrTest("foo %S", NULL, "foo (null)"); + DoStrTest("foo %hS", NULL, "foo (null)"); + DoWStrTest("foo %lS", NULL, "foo (null)"); + DoWStrTest("foo %wS", NULL, "foo (null)"); + DoWStrTest("foo %LS", NULL, "foo (null)"); + DoWStrTest("foo %I64S", NULL, "foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt index 88817fcffb..9571f586c3 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test4 add_dependencies(paltest_vsprintf_test4 coreclrpal) target_link_libraries(paltest_vsprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp index dc43a9e2c7..e052d8ee68 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp @@ -31,7 +31,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest("%p", NULL, "NULL", "0000000000000000"); DoPointerTest("%p", ptr, "pointer to 0x123456", "0000000000123456"); diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt deleted file mode 100644 index 6d14bf76bf..0000000000 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test5.cpp -) - -add_executable(paltest_vsprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_vsprintf_test5 coreclrpal) - -target_link_libraries(paltest_vsprintf_test5 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp deleted file mode 100644 index e630d8863b..0000000000 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test5.c -** -** Purpose: Test #5 for the vsprintf function. -** -** -**===================================================================*/ - -#include -#include "../vsprintf.h" - -/* - * Notes: memcmp is used, as is strlen. - */ - - -int __cdecl main(int argc, char *argv[]) -{ - if (PAL_Initialize(argc, argv) != 0) - { - return(FAIL); - } - - DoTest("foo %n bar", 4, "foo bar"); - DoTest("foo %#n bar", 4, "foo bar"); - DoTest("foo % n bar", 4, "foo bar"); - DoTest("foo %+n bar", 4, "foo bar"); - DoTest("foo %-n bar", 4, "foo bar"); - DoTest("foo %0n bar", 4, "foo bar"); - DoShortTest("foo %hn bar", 4, "foo bar"); - DoTest("foo %ln bar", 4, "foo bar"); - DoTest("foo %Ln bar", 4, "foo bar"); - DoTest("foo %I64n bar", 4, "foo bar"); - DoTest("foo %20.3n bar", 4, "foo bar"); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat deleted file mode 100644 index 81748f88b9..0000000000 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = vsprintf -Name = Positive Test for vsprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests the PAL implementation of the vsprintf function. -= Tests vsprintf with the count specifier. -= This test is modeled after _snprintf. diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt index 606fe3b965..7dc7e1d621 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test6 add_dependencies(paltest_vsprintf_test6 coreclrpal) target_link_libraries(paltest_vsprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt index 2dee276968..7b05fbeb51 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test7 add_dependencies(paltest_vsprintf_test7 coreclrpal) target_link_libraries(paltest_vsprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt index 8dac76fc3a..36231aa954 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test8 add_dependencies(paltest_vsprintf_test8 coreclrpal) target_link_libraries(paltest_vsprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt index 95f0faad87..ca74546b0e 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsprintf_test9 add_dependencies(paltest_vsprintf_test9 coreclrpal) target_link_libraries(paltest_vsprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h b/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h index 7b04a777ca..22bf53e53b 100644 --- a/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h +++ b/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h @@ -14,13 +14,13 @@ #define __VSPRINTF_H__ /* These functions leaks memory like crazy. C'est la vie. */ -int testvsp(char* buf, const char* format, ...) +int testvsp(char* buf, size_t buffSize, const char* format, ...) { int retVal; va_list arglist; va_start(arglist, format); - retVal = vsprintf(buf, format, arglist); + retVal = _vsnprintf_s(buf, buffSize, _TRUNCATE, format, arglist); va_end(arglist); return (retVal); @@ -30,7 +30,7 @@ void DoStrTest(const char *formatstr, char* param, const char *checkstr) { char buf[256] = { 0 }; - testvsp(buf, formatstr, param); + testvsp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) { Fail("ERROR: failed to insert string \"%s\" into \"%s\"\n" @@ -43,7 +43,7 @@ void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr) { char buf[256] = { 0 }; - testvsp(buf, formatstr, param); + testvsp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) { Fail("ERROR: failed to insert wide string \"%s\" into \"%s\"\n" @@ -57,7 +57,7 @@ void DoCharTest(const char *formatstr, char param, const char *checkstr) { char buf[256] = { 0 }; - testvsp(buf, formatstr, param); + testvsp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) { Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n" @@ -70,7 +70,7 @@ void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr) { char buf[256] = { 0 }; - testvsp(buf, formatstr, param); + testvsp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) { Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n" @@ -83,7 +83,7 @@ void DoNumTest(const char *formatstr, int value, const char *checkstr) { char buf[256] = { 0 }; - testvsp(buf, formatstr, value); + testvsp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) { Fail("ERROR: failed to insert %#x into \"%s\"\n" @@ -96,7 +96,7 @@ void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *c { char buf[256] = { 0 }; - testvsp(buf, formatstr, value); + testvsp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr, strlen(buf) + 1) != 0) { Fail("ERROR: failed to insert %s into \"%s\"\n" @@ -109,7 +109,7 @@ void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, ch { char buf[256] = { 0 }; - testvsp(buf, formatstr, value); + testvsp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) { @@ -124,7 +124,7 @@ void DoArgumentPrecTest(const char *formatstr, int precision, void *param, { char buf[256]; - testvsp(buf, formatstr, precision, param); + testvsp(buf, _countof(buf), formatstr, precision, param); if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) { @@ -140,7 +140,7 @@ void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param { char buf[256]; - testvsp(buf, formatstr, precision, param); + testvsp(buf, _countof(buf), formatstr, precision, param); if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0 && memcmp(buf, checkstr2, strlen(checkstr2) + 1) != 0) { @@ -155,7 +155,7 @@ void DoPointerTest(const char *formatstr, void* param, char* paramstr, { char buf[256] = { 0 }; - testvsp(buf, formatstr, param); + testvsp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr1, strlen(checkstr1) + 1)) { Fail("ERROR: failed to insert %s into \"%s\"\n" @@ -169,7 +169,7 @@ void DoI64DoubleTest(const char *formatstr, INT64 value, char *valuestr, { char buf[256] = { 0 }; - testvsp(buf, formatstr, value); + testvsp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr1, strlen(checkstr1) + 1) != 0) { Fail("ERROR: failed to insert %s into \"%s\"\n" @@ -183,7 +183,7 @@ void DoTest(const char *formatstr, int param, const char *checkstr) char buf[256] = { 0 }; int n = -1; - testvsp(buf, formatstr, &n); + testvsp(buf, _countof(buf), formatstr, &n); if (n != param) { @@ -201,7 +201,7 @@ void DoShortTest(const char *formatstr, int param, const char *checkstr) char buf[256] = { 0 }; short int n = -1; - testvsp(buf, formatstr, &n); + testvsp(buf, _countof(buf), formatstr, &n); if (n != param) { diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt index cafb9536b0..8fe1cb60ac 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory(test19) add_subdirectory(test2) add_subdirectory(test3) add_subdirectory(test4) -add_subdirectory(test5) add_subdirectory(test6) add_subdirectory(test7) add_subdirectory(test8) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt index 1d6233744a..6b23e50345 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test1 add_dependencies(paltest_vswprintf_test1 coreclrpal) target_link_libraries(paltest_vswprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp index d386ce104f..968f8a5c69 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp @@ -27,7 +27,7 @@ int __cdecl main(int argc, char *argv[]) return(FAIL); checkstr = convert("hello world"); - testvswp(buf, checkstr); + testvswp(buf, _countof(buf), checkstr); if (memcmp(checkstr, buf, wcslen(checkstr)*2+2) != 0) { diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt index e5301427eb..4e6171ec61 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test10 add_dependencies(paltest_vswprintf_test10 coreclrpal) target_link_libraries(paltest_vswprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt index 1cfadb9300..9e37b63b1f 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test11 add_dependencies(paltest_vswprintf_test11 coreclrpal) target_link_libraries(paltest_vswprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt index f5a582a970..2747ebf468 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test12 add_dependencies(paltest_vswprintf_test12 coreclrpal) target_link_libraries(paltest_vswprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt index 5571d7336f..4c96d3fecc 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test13 add_dependencies(paltest_vswprintf_test13 coreclrpal) target_link_libraries(paltest_vswprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt index 234029ead4..62a9efc660 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test14 add_dependencies(paltest_vswprintf_test14 coreclrpal) target_link_libraries(paltest_vswprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt index b705268bc7..2142c53044 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test15 add_dependencies(paltest_vswprintf_test15 coreclrpal) target_link_libraries(paltest_vswprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt index da296bcf32..44fd1145b9 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test16 add_dependencies(paltest_vswprintf_test16 coreclrpal) target_link_libraries(paltest_vswprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt index 02234c1672..2d1d8cd85e 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test17 add_dependencies(paltest_vswprintf_test17 coreclrpal) target_link_libraries(paltest_vswprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt index 0c0e5b566b..d561baef83 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test18 add_dependencies(paltest_vswprintf_test18 coreclrpal) target_link_libraries(paltest_vswprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt index 066db8ab84..e2e6001cce 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test19 add_dependencies(paltest_vswprintf_test19 coreclrpal) target_link_libraries(paltest_vswprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp index 1d1c5656b2..12f2b7ba99 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp @@ -24,7 +24,7 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, { WCHAR buf[256]; - testvswp(buf, formatstr, precision, param); + testvswp(buf, _countof(buf), formatstr, precision, param); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 && memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0) { @@ -43,7 +43,7 @@ void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, { WCHAR buf[256]; - testvswp(buf, formatstr, precision, param); + testvswp(buf, _countof(buf), formatstr, precision, param); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 && memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0) { diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt index abfceca9e2..b1dee38b4a 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test2 add_dependencies(paltest_vswprintf_test2 coreclrpal) target_link_libraries(paltest_vswprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp index 491d99f0cf..a7b1b3a336 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp @@ -34,6 +34,12 @@ int __cdecl main(int argc, char *argv[]) DoWStrTest(convert("foo %5.2s"), convert("bar"), convert("foo ba")); DoWStrTest(convert("foo %-5s"), convert("bar"), convert("foo bar ")); DoWStrTest(convert("foo %05s"), convert("bar"), convert("foo 00bar")); + DoWStrTest(convert("foo %s"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hs"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %ws"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %Ls"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %I64s"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt index 7f4798dbc5..4d49a107b8 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test3 add_dependencies(paltest_vswprintf_test3 coreclrpal) target_link_libraries(paltest_vswprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp index 1eb0b65ebe..40c7d2afcf 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp @@ -34,6 +34,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest(convert("foo %5.2S"), "bar", convert("foo ba")); DoStrTest(convert("foo %-5S"), "bar", convert("foo bar ")); DoStrTest(convert("foo %05S"), "bar", convert("foo 00bar")); + DoStrTest(convert("foo %S"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %hS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %lS"), NULL, convert("foo (null)")); + DoWStrTest(convert("foo %wS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %LS"), NULL, convert("foo (null)")); + DoStrTest(convert("foo %I64S"), NULL, convert("foo (null)")); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt index 05701ac179..d38b9cd824 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test4 add_dependencies(paltest_vswprintf_test4 coreclrpal) target_link_libraries(paltest_vswprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp index 5c9047b5a7..c54fe6aabb 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp @@ -21,7 +21,7 @@ static void DoPointerTest(WCHAR *formatstr, void* param, WCHAR* paramstr, { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, param); + testvswp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0) { @@ -39,7 +39,7 @@ static void DoI64DoubleTest(WCHAR *formatstr, INT64 value, WCHAR *valuestr, { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, value); + testvswp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0) { Fail("ERROR: failed to insert %s into \"%s\"\n" @@ -62,7 +62,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); DoPointerTest(convert("%p"), NULL, convert("NULL"), convert("0000000000000000")); DoPointerTest(convert("%p"), ptr, convert("pointer to 0x123456"), diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt deleted file mode 100644 index 888ce27d22..0000000000 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12.2) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(SOURCES - test5.cpp -) - -add_executable(paltest_vswprintf_test5 - ${SOURCES} -) - -add_dependencies(paltest_vswprintf_test5 coreclrpal) - -target_link_libraries(paltest_vswprintf_test5 - pthread - m - coreclrpal -) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp deleted file mode 100644 index 42146c8be7..0000000000 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -/*===================================================================== -** -** Source: test5.c -** -** Purpose: Test #5 for the vswprintf function. -** -** -**===================================================================*/ - -#include -#include "../vswprintf.h" - -/* memcmp is used to verify the results, so this test is dependent on it. */ -/* ditto with wcslen */ - -static void DoTest(WCHAR *formatstr, int param, WCHAR *checkstr) -{ - WCHAR buf[256] = { 0 }; - int n = -1; - - testvswp(buf, formatstr, &n); - - if (n != param) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %d\n", - param, n); - } - - if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0) - { - Fail("ERROR: Expected \"%s\" got \"%s\".\n", - convertC(checkstr), convertC(buf)); - } -} - -static void DoShortTest(WCHAR *formatstr, int param, WCHAR *checkstr) -{ - WCHAR buf[256] = { 0 }; - short int n = -1; - - testvswp(buf, formatstr, &n); - - if (n != param) - { - Fail("ERROR: Expected count parameter to resolve to %d, got %d\n", - param, n); - } - - if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0) - { - Fail("ERROR: Expected \"%s\" got \"%s\".\n", - convertC(checkstr), convertC(buf)); - } -} - -int __cdecl main(int argc, char *argv[]) -{ - if (PAL_Initialize(argc, argv) != 0) - return(FAIL); - - DoTest(convert("foo %n bar"), 4, convert("foo bar")); - DoTest(convert("foo %#n bar"), 4, convert("foo bar")); - DoTest(convert("foo % n bar"), 4, convert("foo bar")); - DoTest(convert("foo %+n bar"), 4, convert("foo bar")); - DoTest(convert("foo %-n bar"), 4, convert("foo bar")); - DoTest(convert("foo %0n bar"), 4, convert("foo bar")); - DoShortTest(convert("foo %hn bar"), 4, convert("foo bar")); - DoTest(convert("foo %ln bar"), 4, convert("foo bar")); - DoTest(convert("foo %Ln bar"), 4, convert("foo bar")); - DoTest(convert("foo %I64n bar"), 4, convert("foo bar")); - DoTest(convert("foo %20.3n bar"), 4, convert("foo bar")); - - PAL_Terminate(); - return PASS; -} diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat deleted file mode 100644 index 17ca0fd33b..0000000000 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/testinfo.dat +++ /dev/null @@ -1,14 +0,0 @@ -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# See the LICENSE file in the project root for more information. - -Version = 1.0 -Section = C Runtime -Function = vswprintf -Name = Positive Test for vswprintf -TYPE = DEFAULT -EXE1 = test5 -Description -= Tests the PAL implementation of the vswprintf function. -= Tests vswprintf with the count specifier. -= This test is modeled after _snwprintf. diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt index bfbb17ccef..0caa96ed78 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test6 add_dependencies(paltest_vswprintf_test6 coreclrpal) target_link_libraries(paltest_vswprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt index 8b980586bc..3244576813 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test7 add_dependencies(paltest_vswprintf_test7 coreclrpal) target_link_libraries(paltest_vswprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt index 07ba473844..f972c00067 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test8 add_dependencies(paltest_vswprintf_test8 coreclrpal) target_link_libraries(paltest_vswprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt index 11c77787e9..ee9c04d7ee 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vswprintf_test9 add_dependencies(paltest_vswprintf_test9 coreclrpal) target_link_libraries(paltest_vswprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h b/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h index 37a379212e..36895d207f 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h @@ -15,13 +15,13 @@ #define __vswprintf_H__ /* These functions leaks memory like crazy. C'est la vie. */ -int testvswp(wchar_t* buf, const wchar_t* format, ...) +int testvswp(wchar_t* buf, size_t buffSize, const wchar_t* format, ...) { int retVal = 0; va_list arglist; va_start(arglist, format); - retVal = vswprintf(buf, format, arglist); + retVal = _vsnwprintf_s(buf, buffSize, _TRUNCATE, format, arglist); va_end(arglist); return( retVal); @@ -31,7 +31,7 @@ void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, param); + testvswp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(buf) * 2 + 2) != 0) { @@ -46,7 +46,7 @@ void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, param); + testvswp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(buf) * 2 + 2) != 0) { @@ -61,7 +61,7 @@ void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, param); + testvswp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0) { Fail("ERROR: failed to insert char \'%c\' (%d) into \"%s\"\n" @@ -75,7 +75,7 @@ void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, param); + testvswp(buf, _countof(buf), formatstr, param); if (memcmp(buf, checkstr, wcslen(buf)*2 + 2) != 0) { Fail("ERROR: failed to insert wide char \'%c\' (%d) into \"%s\"\n" @@ -89,7 +89,7 @@ void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr) { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, value); + testvswp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr, wcslen(buf)* 2 + 2) != 0) { Fail("ERROR: failed to insert %#x into \"%s\"\n" @@ -102,7 +102,7 @@ void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCH { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, value); + testvswp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr, wcslen(buf)* 2 + 2) != 0) { Fail("ERROR: failed to insert %s into \"%s\"\n" @@ -115,7 +115,7 @@ void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, { WCHAR buf[256] = { 0 }; - testvswp(buf, formatstr, value); + testvswp(buf, _countof(buf), formatstr, value); if (memcmp(buf, checkstr1, wcslen(checkstr1) + 2) != 0 && memcmp(buf, checkstr2, wcslen(checkstr2) + 2) != 0) { diff --git a/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt index 815c585de4..8ee3b694b2 100644 --- a/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcscat_test1 add_dependencies(paltest_wcscat_test1 coreclrpal) target_link_libraries(paltest_wcscat_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt index 9cf0a918a0..f054ae7956 100644 --- a/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcschr_test1 add_dependencies(paltest_wcschr_test1 coreclrpal) target_link_libraries(paltest_wcschr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt index 98c05352f3..8f97a6386b 100644 --- a/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcscmp_test1 add_dependencies(paltest_wcscmp_test1 coreclrpal) target_link_libraries(paltest_wcscmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt index 872b2dec5e..c7fdcb8372 100644 --- a/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcscpy_test1 add_dependencies(paltest_wcscpy_test1 coreclrpal) target_link_libraries(paltest_wcscpy_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt index b641a830f5..e68496d34a 100644 --- a/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcslen_test1 add_dependencies(paltest_wcslen_test1 coreclrpal) target_link_libraries(paltest_wcslen_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt index e90e2b7bc4..8eba7a7c86 100644 --- a/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsncat_test1 add_dependencies(paltest_wcsncat_test1 coreclrpal) target_link_libraries(paltest_wcsncat_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt index f5511a86c6..4fc8155853 100644 --- a/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsncmp_test1 add_dependencies(paltest_wcsncmp_test1 coreclrpal) target_link_libraries(paltest_wcsncmp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt index a7254a709c..d157bf29e9 100644 --- a/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsncpy_test1 add_dependencies(paltest_wcsncpy_test1 coreclrpal) target_link_libraries(paltest_wcsncpy_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt index 14c1fe83a4..2a9434442b 100644 --- a/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcspbrk_test1 add_dependencies(paltest_wcspbrk_test1 coreclrpal) target_link_libraries(paltest_wcspbrk_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt index abdd6d56d2..3d808e1e71 100644 --- a/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsrchr_test1 add_dependencies(paltest_wcsrchr_test1 coreclrpal) target_link_libraries(paltest_wcsrchr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt index 0e1e0b47b0..bc09f75983 100644 --- a/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcsstr_test1 add_dependencies(paltest_wcsstr_test1 coreclrpal) target_link_libraries(paltest_wcsstr_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt index cca01ca964..2370ee8aad 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstod_test1 add_dependencies(paltest_wcstod_test1 coreclrpal) target_link_libraries(paltest_wcstod_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt index ae7450891e..1251c2c9c0 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstod_test2 add_dependencies(paltest_wcstod_test2 coreclrpal) target_link_libraries(paltest_wcstod_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt index 6b5bed9552..0f63a7bf6d 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstok_test1 add_dependencies(paltest_wcstok_test1 coreclrpal) target_link_libraries(paltest_wcstok_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt index f76018fca3..fc81ee402a 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstol_test1 add_dependencies(paltest_wcstol_test1 coreclrpal) target_link_libraries(paltest_wcstol_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt index 8dc2ab6b65..4f7ad53723 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstol_test2 add_dependencies(paltest_wcstol_test2 coreclrpal) target_link_libraries(paltest_wcstol_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt index 310f97d6dc..df2d5ef607 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstol_test3 add_dependencies(paltest_wcstol_test3 coreclrpal) target_link_libraries(paltest_wcstol_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt index 23928aa704..9af9af8be0 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstol_test4 add_dependencies(paltest_wcstol_test4 coreclrpal) target_link_libraries(paltest_wcstol_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt index 16c709ffa0..6134216d5b 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstol_test5 add_dependencies(paltest_wcstol_test5 coreclrpal) target_link_libraries(paltest_wcstol_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt index 80ccaf609b..ae7efe8d42 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstol_test6 add_dependencies(paltest_wcstol_test6 coreclrpal) target_link_libraries(paltest_wcstol_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt index 58f002ab32..bcdcd7cc7a 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstoul_test1 add_dependencies(paltest_wcstoul_test1 coreclrpal) target_link_libraries(paltest_wcstoul_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt index 2c8d012310..4259cef224 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstoul_test2 add_dependencies(paltest_wcstoul_test2 coreclrpal) target_link_libraries(paltest_wcstoul_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt index 353df07f52..758c437260 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstoul_test3 add_dependencies(paltest_wcstoul_test3 coreclrpal) target_link_libraries(paltest_wcstoul_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt index e1e7d55420..151d372d14 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstoul_test4 add_dependencies(paltest_wcstoul_test4 coreclrpal) target_link_libraries(paltest_wcstoul_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt index 9e83c6074c..97b1e91e61 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstoul_test5 add_dependencies(paltest_wcstoul_test5 coreclrpal) target_link_libraries(paltest_wcstoul_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt index 8352d0cbbe..b678e2ae0c 100644 --- a/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wcstoul_test6 add_dependencies(paltest_wcstoul_test6 coreclrpal) target_link_libraries(paltest_wcstoul_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt index f95fc12ea1..8d3ab28cac 100644 --- a/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wprintf_test1 add_dependencies(paltest_wprintf_test1 coreclrpal) target_link_libraries(paltest_wprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt index 325e8046d5..3119489709 100644 --- a/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_wprintf_test2 add_dependencies(paltest_wprintf_test2 coreclrpal) target_link_libraries(paltest_wprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp index 254e98a394..4e54d452e8 100644 --- a/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp @@ -38,6 +38,12 @@ int __cdecl main(int argc, char *argv[]) DoStrTest(u"foo %5.2s", u"bar", u"foo ba"); DoStrTest(u"foo %-5s", u"bar", u"foo bar "); DoStrTest(u"foo %05s", u"bar", u"foo 00bar"); + DoStrTest(u"foo %s", NULL, u"foo (null)"); + DoStrTest(u"foo %hs", NULL, u"foo (null)"); + DoStrTest(u"foo %ls", NULL, u"foo (null)"); + DoStrTest(u"foo %ws", NULL, u"foo (null)"); + DoStrTest(u"foo %Ls", NULL, u"foo (null)"); + DoStrTest(u"foo %I64s", NULL, u"foo (null)"); PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/common/ResultTime.h b/src/pal/tests/palsuite/common/ResultTime.h index df706e7a64..82daeb83c4 100644 --- a/src/pal/tests/palsuite/common/ResultTime.h +++ b/src/pal/tests/palsuite/common/ResultTime.h @@ -11,11 +11,7 @@ const char *szDotNetInstallEnvVar = "DOTNET_INSTALL"; const char *szQASupportDirEnvVar = "QA_SUPPORT_DIR"; -#ifdef PLATFORM_UNIX #define SEPERATOR "/" -#else -#define SEPERATOR "\\" -#endif char *getBuildNumber() { char *szBuildFileName = "buildinfo.txt"; @@ -34,16 +30,6 @@ char *getBuildNumber() Fail("ERROR: Couldn't allocate enough memory to potentially store build number\n"); } -#ifndef PLATFORM_UNIX - pDirectoryName = getenv(szDotNetInstallEnvVar); - if (pDirectoryName == NULL) - { - /* This condition may exist if the test is being run in say the Dev environment.*/ - Trace("WARNING: Coriolis Test Environment may not be setup correctly. Variable DOTNET_INSTALL not set\n"); - _snprintf(szTempValue, 99, "0000.00"); - return szTempValue; - } -#else pDirectoryName = getenv(szQASupportDirEnvVar); if (pDirectoryName == NULL) { @@ -52,14 +38,8 @@ char *getBuildNumber() return szTempValue; } -#endif //PLATFORM_UNIX - -#ifndef PLATFORM_UNIX - _snprintf(szBuildFileLoc, MAX_PATH, "%s%s%s", pDirectoryName, SEPERATOR, szBuildFileName); -#else // To avoid buffer overruns for pDirectoryName _snprintf(szBuildFileLoc, MAX_PATH, "%s/../1.0%s%s", pDirectoryName, SEPERATOR, szBuildFileName); -#endif //PLATFORM_UNIX fp = fopen( szBuildFileLoc, "r"); if( fp == NULL) { 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 @@ -444,14 +444,10 @@ ULONGLONG GetTicks(void) unsigned long a, d; 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 @@ -448,14 +448,10 @@ ULONGLONG GetTicks(void) unsigned long a, d; 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 ) diff --git a/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt index 1b2ae538cc..5eba74f9f0 100644 --- a/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_debugbreak_test1 add_dependencies(paltest_debugbreak_test1 coreclrpal) target_link_libraries(paltest_debugbreak_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt index 3000734afe..46a870c111 100644 --- a/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_outputdebugstringa_test1 add_dependencies(paltest_outputdebugstringa_test1 coreclrpal) target_link_libraries(paltest_outputdebugstringa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,9 +28,7 @@ add_executable(paltest_outputdebugstringa_test1_helper add_dependencies(paltest_outputdebugstringa_test1_helper coreclrpal) target_link_libraries(paltest_outputdebugstringa_test1_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt index 4a93f0e394..802de0ee9a 100644 --- a/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_outputdebugstringw_test1 add_dependencies(paltest_outputdebugstringw_test1 coreclrpal) target_link_libraries(paltest_outputdebugstringw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt index afd581fb92..af19587ffa 100644 --- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_writeprocessmemory_test1 add_dependencies(paltest_writeprocessmemory_test1 coreclrpal) target_link_libraries(paltest_writeprocessmemory_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_writeprocessmemory_test1_helper add_dependencies(paltest_writeprocessmemory_test1_helper coreclrpal) target_link_libraries(paltest_writeprocessmemory_test1_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt index 3a5067c926..d6e11a683a 100644 --- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_writeprocessmemory_test3 add_dependencies(paltest_writeprocessmemory_test3 coreclrpal) target_link_libraries(paltest_writeprocessmemory_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_writeprocessmemory_test3_helper add_dependencies(paltest_writeprocessmemory_test3_helper coreclrpal) target_link_libraries(paltest_writeprocessmemory_test3_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt index 7cba09038a..9eec2bd78d 100644 --- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_writeprocessmemory_test4 add_dependencies(paltest_writeprocessmemory_test4 coreclrpal) target_link_libraries(paltest_writeprocessmemory_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_writeprocessmemory_test4_helper add_dependencies(paltest_writeprocessmemory_test4_helper coreclrpal) target_link_libraries(paltest_writeprocessmemory_test4_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt index 4e30869d85..336eafd718 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_filter_test1 add_dependencies(paltest_pal_except_filter_test1 coreclrpal) target_link_libraries(paltest_pal_except_filter_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt index 3f979c08db..e9c57b44c3 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_filter_test2 add_dependencies(paltest_pal_except_filter_test2 coreclrpal) target_link_libraries(paltest_pal_except_filter_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt index 2bdf44e058..45286ac198 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_filter_test3 add_dependencies(paltest_pal_except_filter_test3 coreclrpal) target_link_libraries(paltest_pal_except_filter_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt index cf0a5e7c6d..be9ab1aa61 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_filter_ex_test1 add_dependencies(paltest_pal_except_filter_ex_test1 coreclrpal) target_link_libraries(paltest_pal_except_filter_ex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt index a3f82c26b9..4d90c711cd 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_filter_ex_test2 add_dependencies(paltest_pal_except_filter_ex_test2 coreclrpal) target_link_libraries(paltest_pal_except_filter_ex_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt index 532b29a9a1..6a52145151 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_filter_ex_test3 add_dependencies(paltest_pal_except_filter_ex_test3 coreclrpal) target_link_libraries(paltest_pal_except_filter_ex_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt index b478de63e4..ad208751fc 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_try_except_test1 add_dependencies(paltest_pal_try_except_test1 coreclrpal) target_link_libraries(paltest_pal_try_except_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt index 0e344a9320..da34fb23fa 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_try_except_test2 add_dependencies(paltest_pal_try_except_test2 coreclrpal) target_link_libraries(paltest_pal_try_except_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt index cced8a11be..2ab8a25675 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_try_except_ex_test1 add_dependencies(paltest_pal_try_except_ex_test1 coreclrpal) target_link_libraries(paltest_pal_try_except_ex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt index c3549b5d87..80d90dd9b1 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_try_except_ex_test2 add_dependencies(paltest_pal_try_except_ex_test2 coreclrpal) target_link_libraries(paltest_pal_try_except_ex_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt index 34790da3d3..d9507b046b 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_try_except_ex_test3 add_dependencies(paltest_pal_try_except_ex_test3 coreclrpal) target_link_libraries(paltest_pal_try_except_ex_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt index f004db1658..6b34c1d629 100644 --- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_try_leave_finally_test1 add_dependencies(paltest_pal_try_leave_finally_test1 coreclrpal) target_link_libraries(paltest_pal_try_leave_finally_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt index 2fba7dd9b3..dcc47db93f 100644 --- a/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/RaiseException/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_raiseexception_test1 add_dependencies(paltest_raiseexception_test1 coreclrpal) target_link_libraries(paltest_raiseexception_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt index 7fc9f5f12c..5c9ba2ceee 100644 --- a/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/RaiseException/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_raiseexception_test2 add_dependencies(paltest_raiseexception_test2 coreclrpal) target_link_libraries(paltest_raiseexception_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt index 72e5427b69..a16f832a4a 100644 --- a/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/RaiseException/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_raiseexception_test3 add_dependencies(paltest_raiseexception_test3 coreclrpal) target_link_libraries(paltest_raiseexception_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt index 068427303f..bff5e893e5 100644 --- a/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setunhandledexceptionfilter_test1 add_dependencies(paltest_setunhandledexceptionfilter_test1 coreclrpal) target_link_libraries(paltest_setunhandledexceptionfilter_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt index b219238ef4..a34f673304 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test1 add_dependencies(paltest_pal_except_test1 coreclrpal) target_link_libraries(paltest_pal_except_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt index 27a725353b..a40910eca5 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test2 add_dependencies(paltest_pal_except_test2 coreclrpal) target_link_libraries(paltest_pal_except_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt index 680341a782..6f9e100fb8 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test3 add_dependencies(paltest_pal_except_test3 coreclrpal) target_link_libraries(paltest_pal_except_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt index 98eb7bfb23..fb51d9890f 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test4 add_dependencies(paltest_pal_except_test4 coreclrpal) target_link_libraries(paltest_pal_except_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt index 9a39e32cce..4ec8c69957 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test5 add_dependencies(paltest_pal_except_test5 coreclrpal) target_link_libraries(paltest_pal_except_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt index d009128871..bc1742c178 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test6 add_dependencies(paltest_pal_except_test6 coreclrpal) target_link_libraries(paltest_pal_except_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt index 33fee62cc2..7cb6be8d94 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_except_test7 add_dependencies(paltest_pal_except_test7 coreclrpal) target_link_libraries(paltest_pal_except_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt index 67cc6c0b92..fe1cbbe0b6 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_pal_finally_test1 add_dependencies(paltest_pal_finally_test1 coreclrpal) target_link_libraries(paltest_pal_finally_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt index b0458db998..4a3abc2d64 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt @@ -43,7 +43,7 @@ add_dependencies(paltest_pal_sxs_test1_dll1 ) target_link_libraries(paltest_pal_sxs_test1_dll1 - pthread + ${COMMON_TEST_LIBRARIES} m coreclrpal ) @@ -71,13 +71,10 @@ set_property(TARGET paltest_pal_sxs_test1_dll2 APPEND_STRING PROPERTY LINK_DEPEN add_dependencies(paltest_pal_sxs_test1_dll2 dlltest2_exports - coreclrpal ) target_link_libraries(paltest_pal_sxs_test1_dll2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) # Main program diff --git a/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt index e624bef462..ac76e5dc12 100644 --- a/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_arefileapisansi_test1 add_dependencies(paltest_arefileapisansi_test1 coreclrpal) target_link_libraries(paltest_arefileapisansi_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt index fa96a44cdd..4883aee387 100644 --- a/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_comparefiletime_test1 add_dependencies(paltest_comparefiletime_test1 coreclrpal) target_link_libraries(paltest_comparefiletime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt index 13abbc0979..0890ebe2e7 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilea_test1 add_dependencies(paltest_copyfilea_test1 coreclrpal) target_link_libraries(paltest_copyfilea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt index cd0d8bc6cf..8844af3f8f 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilea_test2 add_dependencies(paltest_copyfilea_test2 coreclrpal) target_link_libraries(paltest_copyfilea_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt index 0bb41b8d8f..3fbdc3e187 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilea_test3 add_dependencies(paltest_copyfilea_test3 coreclrpal) target_link_libraries(paltest_copyfilea_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt index 12f85d1747..0bb3a32770 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilea_test4 add_dependencies(paltest_copyfilea_test4 coreclrpal) target_link_libraries(paltest_copyfilea_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt index 20c8141d90..70ff478e35 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilew_test1 add_dependencies(paltest_copyfilew_test1 coreclrpal) target_link_libraries(paltest_copyfilew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt index 4201bdca88..beebf1b86c 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilew_test2 add_dependencies(paltest_copyfilew_test2 coreclrpal) target_link_libraries(paltest_copyfilew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt index d0fd94c990..9e18a308e8 100644 --- a/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_copyfilew_test3 add_dependencies(paltest_copyfilew_test3 coreclrpal) target_link_libraries(paltest_copyfilew_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt index 1dc87fa34b..57ac440265 100644 --- a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createdirectorya_test1 add_dependencies(paltest_createdirectorya_test1 coreclrpal) target_link_libraries(paltest_createdirectorya_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt index 3ee8abbcc2..b764145856 100644 --- a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createdirectorya_test2 add_dependencies(paltest_createdirectorya_test2 coreclrpal) target_link_libraries(paltest_createdirectorya_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt index f8cb584cc6..1fd09ea82d 100644 --- a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createdirectoryw_test1 add_dependencies(paltest_createdirectoryw_test1 coreclrpal) target_link_libraries(paltest_createdirectoryw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt index f8614ca5a6..2dcfe6d49e 100644 --- a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createdirectoryw_test2 add_dependencies(paltest_createdirectoryw_test2 coreclrpal) target_link_libraries(paltest_createdirectoryw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt index edacdbd621..dec8c30559 100644 --- a/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilea_test1 add_dependencies(paltest_createfilea_test1 coreclrpal) target_link_libraries(paltest_createfilea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt index 820e169a37..d437410a1b 100644 --- a/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilew_test1 add_dependencies(paltest_createfilew_test1 coreclrpal) target_link_libraries(paltest_createfilew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt index b979c206b2..a07a00076d 100644 --- a/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/DeleteFileA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_deletefilea_test1 add_dependencies(paltest_deletefilea_test1 coreclrpal) target_link_libraries(paltest_deletefilea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt index eada6145b9..7aff64ccff 100644 --- a/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_deletefilew_test1 add_dependencies(paltest_deletefilew_test1 coreclrpal) target_link_libraries(paltest_deletefilew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt index 7045983629..7c6629d243 100644 --- a/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_filecanonicalizepath_test1 add_dependencies(paltest_filecanonicalizepath_test1 coreclrpal) target_link_libraries(paltest_filecanonicalizepath_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt index 6ec6a98b3f..9d5c678be3 100644 --- a/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_filetimetodosdatetime_test1 add_dependencies(paltest_filetimetodosdatetime_test1 coreclrpal) target_link_libraries(paltest_filetimetodosdatetime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt index d97c69e6ee..d5a92fa405 100644 --- a/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findclose_test1 add_dependencies(paltest_findclose_test1 coreclrpal) target_link_libraries(paltest_findclose_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt index aeac94d42f..c485edbbac 100644 --- a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findfirstfilea_test1 add_dependencies(paltest_findfirstfilea_test1 coreclrpal) target_link_libraries(paltest_findfirstfilea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt index 2a6ea2b7a4..191e42d5c3 100644 --- a/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findfirstfilew_test1 add_dependencies(paltest_findfirstfilew_test1 coreclrpal) target_link_libraries(paltest_findfirstfilew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt index 6e97b7aaad..4dcaa99982 100644 --- a/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findnextfilea_test1 add_dependencies(paltest_findnextfilea_test1 coreclrpal) target_link_libraries(paltest_findnextfilea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt index e037bd3aa0..d5871a400f 100644 --- a/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findnextfilea_test2 add_dependencies(paltest_findnextfilea_test2 coreclrpal) target_link_libraries(paltest_findnextfilea_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt index a7c3e7ea02..62bf2f860b 100644 --- a/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findnextfilew_test1 add_dependencies(paltest_findnextfilew_test1 coreclrpal) target_link_libraries(paltest_findnextfilew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt index 7b4c3c9597..2b9a43f8f4 100644 --- a/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_findnextfilew_test2 add_dependencies(paltest_findnextfilew_test2 coreclrpal) target_link_libraries(paltest_findnextfilew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt index 6c24ac76d1..433e89bbf4 100644 --- a/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_flushfilebuffers_test1 add_dependencies(paltest_flushfilebuffers_test1 coreclrpal) target_link_libraries(paltest_flushfilebuffers_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt index 64ab6ea945..7753cadea4 100644 --- a/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getconsolecp_test1 add_dependencies(paltest_getconsolecp_test1 coreclrpal) target_link_libraries(paltest_getconsolecp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt index 756f87b382..5784789af7 100644 --- a/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getconsoleoutputcp_test1 add_dependencies(paltest_getconsoleoutputcp_test1 coreclrpal) target_link_libraries(paltest_getconsoleoutputcp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt index 28efc6897f..dad46b6f6b 100644 --- a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentdirectorya_test1 add_dependencies(paltest_getcurrentdirectorya_test1 coreclrpal) target_link_libraries(paltest_getcurrentdirectorya_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt index ee07f5e0d1..96b148c1b1 100644 --- a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentdirectoryw_test1 add_dependencies(paltest_getcurrentdirectoryw_test1 coreclrpal) target_link_libraries(paltest_getcurrentdirectoryw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt index 7de0b275f6..e0238707e5 100644 --- a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getdiskfreespacew_test1 add_dependencies(paltest_getdiskfreespacew_test1 coreclrpal) target_link_libraries(paltest_getdiskfreespacew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt index 7bcbf55c42..fb6a08789b 100644 --- a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getdiskfreespacew_test2 add_dependencies(paltest_getdiskfreespacew_test2 coreclrpal) target_link_libraries(paltest_getdiskfreespacew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt index 414df7f6b5..fa2182242e 100644 --- a/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_getfileattributesa_test1 add_dependencies(paltest_getfileattributesa_test1 coreclrpal) target_link_libraries(paltest_getfileattributesa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) add_subdirectory(.hidden_directory) add_subdirectory(.hidden_ro_directory) diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt index 6ea24d9d32..41f08e15d9 100644 --- a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_getfileattributesexw_test1 add_dependencies(paltest_getfileattributesexw_test1 coreclrpal) target_link_libraries(paltest_getfileattributesexw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) add_subdirectory(.hidden_directory) add_subdirectory(normal_test_directory) diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt index 0faa3bd11e..193b4a5144 100644 --- a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfileattributesexw_test2 add_dependencies(paltest_getfileattributesexw_test2 coreclrpal) target_link_libraries(paltest_getfileattributesexw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt index bc82f3678e..d64a455a8e 100644 --- a/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_getfileattributesw_test1 add_dependencies(paltest_getfileattributesw_test1 coreclrpal) target_link_libraries(paltest_getfileattributesw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) add_subdirectory(.hidden_directory) add_subdirectory(.hidden_ro_directory) diff --git a/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt index f192ba7400..1220041887 100644 --- a/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfilesize_test1 add_dependencies(paltest_getfilesize_test1 coreclrpal) target_link_libraries(paltest_getfilesize_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt index 33a7e2f557..51e7412bdf 100644 --- a/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfilesizeex_test1 add_dependencies(paltest_getfilesizeex_test1 coreclrpal) target_link_libraries(paltest_getfilesizeex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt index b95267ab5b..3c95a5d992 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test1 add_dependencies(paltest_getfiletime_test1 coreclrpal) target_link_libraries(paltest_getfiletime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt index fe02e27bbe..329d8c6553 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test2 add_dependencies(paltest_getfiletime_test2 coreclrpal) target_link_libraries(paltest_getfiletime_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt index bb88966e68..d154a8810b 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test3 add_dependencies(paltest_getfiletime_test3 coreclrpal) target_link_libraries(paltest_getfiletime_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt index e43e7f99a8..416db15a06 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test4 add_dependencies(paltest_getfiletime_test4 coreclrpal) target_link_libraries(paltest_getfiletime_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt index 4af995d207..4072a52fbc 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test5 add_dependencies(paltest_getfiletime_test5 coreclrpal) target_link_libraries(paltest_getfiletime_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt index 87c448b2a6..83d652461b 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test6 add_dependencies(paltest_getfiletime_test6 coreclrpal) target_link_libraries(paltest_getfiletime_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt index cd5cde4d9e..34a08db686 100644 --- a/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletime_test7 add_dependencies(paltest_getfiletime_test7 coreclrpal) target_link_libraries(paltest_getfiletime_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt index cfaba2e738..c0acc6e484 100644 --- a/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletype_test1 add_dependencies(paltest_getfiletype_test1 coreclrpal) target_link_libraries(paltest_getfiletype_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt index 07dae0b04a..1f2ee78f75 100644 --- a/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletype_test2 add_dependencies(paltest_getfiletype_test2 coreclrpal) target_link_libraries(paltest_getfiletype_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt index 9353c85771..ed70e6c96c 100644 --- a/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfiletype_test3 add_dependencies(paltest_getfiletype_test3 coreclrpal) target_link_libraries(paltest_getfiletype_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt index 6198392000..4370c1b155 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamea_test1 add_dependencies(paltest_getfullpathnamea_test1 coreclrpal) target_link_libraries(paltest_getfullpathnamea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt index 3449f2d80b..157ca6946e 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamea_test2 add_dependencies(paltest_getfullpathnamea_test2 coreclrpal) target_link_libraries(paltest_getfullpathnamea_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt index 9d8d242e26..74c96185c6 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamea_test3 add_dependencies(paltest_getfullpathnamea_test3 coreclrpal) target_link_libraries(paltest_getfullpathnamea_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt index abf2bacd1c..bda34bdc25 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamea_test4 add_dependencies(paltest_getfullpathnamea_test4 coreclrpal) target_link_libraries(paltest_getfullpathnamea_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt index d455ca1193..5242015025 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamew_test1 add_dependencies(paltest_getfullpathnamew_test1 coreclrpal) target_link_libraries(paltest_getfullpathnamew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt index d974e940a7..33e04d1a3e 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamew_test2 add_dependencies(paltest_getfullpathnamew_test2 coreclrpal) target_link_libraries(paltest_getfullpathnamew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt index 09439a6372..eaf63760f5 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamew_test3 add_dependencies(paltest_getfullpathnamew_test3 coreclrpal) target_link_libraries(paltest_getfullpathnamew_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt index 11ed9583b6..6398e9207d 100644 --- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getfullpathnamew_test4 add_dependencies(paltest_getfullpathnamew_test4 coreclrpal) target_link_libraries(paltest_getfullpathnamew_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt index 3b9f0b118a..ec5b70bff7 100644 --- a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getlongpathnamew_test1 add_dependencies(paltest_getlongpathnamew_test1 coreclrpal) target_link_libraries(paltest_getlongpathnamew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt index b92e431095..8d7c40b3b4 100644 --- a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getlongpathnamew_test2 add_dependencies(paltest_getlongpathnamew_test2 coreclrpal) target_link_libraries(paltest_getlongpathnamew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt index eaa1721b7e..7a299015b2 100644 --- a/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getstdhandle_test1 add_dependencies(paltest_getstdhandle_test1 coreclrpal) target_link_libraries(paltest_getstdhandle_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt index ef45aa0dec..5a4d2ba15d 100644 --- a/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getstdhandle_test2 add_dependencies(paltest_getstdhandle_test2 coreclrpal) target_link_libraries(paltest_getstdhandle_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt index 4367e880f7..7135abf621 100644 --- a/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getsystemtime_test1 add_dependencies(paltest_getsystemtime_test1 coreclrpal) target_link_libraries(paltest_getsystemtime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt index d149383732..d7421b91c0 100644 --- a/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getsystemtimeasfiletime_test1 add_dependencies(paltest_getsystemtimeasfiletime_test1 coreclrpal) target_link_libraries(paltest_getsystemtimeasfiletime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt index 4ed0ccb537..38fdb4977d 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettempfilenamea_test1 add_dependencies(paltest_gettempfilenamea_test1 coreclrpal) target_link_libraries(paltest_gettempfilenamea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt index 9d9b6461cd..1c302acd95 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettempfilenamea_test2 add_dependencies(paltest_gettempfilenamea_test2 coreclrpal) target_link_libraries(paltest_gettempfilenamea_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt index 446f3cf837..ec18937e01 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettempfilenamea_test3 add_dependencies(paltest_gettempfilenamea_test3 coreclrpal) target_link_libraries(paltest_gettempfilenamea_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt index 6919cf66cd..96ad10bb36 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettempfilenamew_test1 add_dependencies(paltest_gettempfilenamew_test1 coreclrpal) target_link_libraries(paltest_gettempfilenamew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp index 43cda8f447..ebc4d25bcb 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp @@ -104,7 +104,7 @@ int __cdecl main(int argc, char *argv[]) } // now verify that it only used the first 3 characters of the prefix - swprintf(wTempString, convert("%s\\%s"), wPath, wPrefix); + swprintf_s(wTempString, _countof(wTempString), convert("%s\\%s"), wPath, wPrefix); if (memcmp(wTempString, wReturnedName, wcslen(wTempString)*sizeof(WCHAR)) == 0) { free (wPath); diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt index d077463390..bc97c2bc48 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettempfilenamew_test2 add_dependencies(paltest_gettempfilenamew_test2 coreclrpal) target_link_libraries(paltest_gettempfilenamew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt index 3aa0f4a044..50794c3e33 100644 --- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettempfilenamew_test3 add_dependencies(paltest_gettempfilenamew_test3 coreclrpal) target_link_libraries(paltest_gettempfilenamew_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt index 04b240997a..093c8803d5 100644 --- a/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettemppathw_test1 add_dependencies(paltest_gettemppathw_test1 coreclrpal) target_link_libraries(paltest_gettemppathw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt index b096a04653..b8f445b1e7 100644 --- a/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_movefilea_test1 add_dependencies(paltest_movefilea_test1 coreclrpal) target_link_libraries(paltest_movefilea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt index ef2471738c..ac5ea7463b 100644 --- a/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_movefileexa_test1 add_dependencies(paltest_movefileexa_test1 coreclrpal) target_link_libraries(paltest_movefileexa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt index ca6b35e3ac..bbe3d5aa3f 100644 --- a/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_movefileexw_test1 add_dependencies(paltest_movefileexw_test1 coreclrpal) target_link_libraries(paltest_movefileexw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt index 4519746e7b..03b7ab907c 100644 --- a/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_movefilew_test1 add_dependencies(paltest_movefilew_test1 coreclrpal) target_link_libraries(paltest_movefilew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt index 0aceb3708e..8fe1f1d2ed 100644 --- a/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_readfile_test1 add_dependencies(paltest_readfile_test1 coreclrpal) target_link_libraries(paltest_readfile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt index f28ac117a2..2113d67622 100644 --- a/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_readfile_test2 add_dependencies(paltest_readfile_test2 coreclrpal) target_link_libraries(paltest_readfile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp b/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp index f16858e573..789e001700 100644 --- a/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp +++ b/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp @@ -30,11 +30,7 @@ const char* szResultsFile = "Results.txt"; //Previously number of tests was 6, now 4 refer VSW 312690 #define NOOFTESTS 4 -#ifdef __sparc__ -const int PAGESIZE = 8192; -#else // __sparc__ const int PAGESIZE = 4096; -#endif // __sparc__ char *readBuffer; diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt index 26cb675c40..d76a726742 100644 --- a/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_readfile_test3 add_dependencies(paltest_readfile_test3 coreclrpal) target_link_libraries(paltest_readfile_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt index bbf12777b6..2550a21173 100644 --- a/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_readfile_test4 add_dependencies(paltest_readfile_test4 coreclrpal) target_link_libraries(paltest_readfile_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/RemoveDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/RemoveDirectoryA/test1/CMakeLists.txt index 7a8d1c9d57..31a57791b7 100644 --- a/src/pal/tests/palsuite/file_io/RemoveDirectoryA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/RemoveDirectoryA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_removedirectorya_test1 add_dependencies(paltest_removedirectorya_test1 coreclrpal) target_link_libraries(paltest_removedirectorya_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt index 6223bc6197..f995a0e1c5 100644 --- a/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_removedirectoryw_test1 add_dependencies(paltest_removedirectoryw_test1 coreclrpal) target_link_libraries(paltest_removedirectoryw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt index c020a86b61..8de22aebdc 100644 --- a/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_searchpatha_test1 add_dependencies(paltest_searchpatha_test1 coreclrpal) target_link_libraries(paltest_searchpatha_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt index a77d875505..d7539a8ac8 100644 --- a/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_searchpathw_test1 add_dependencies(paltest_searchpathw_test1 coreclrpal) target_link_libraries(paltest_searchpathw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt index 5d0da64ba7..e6fb80f04e 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setcurrentdirectorya_test1 add_dependencies(paltest_setcurrentdirectorya_test1 coreclrpal) target_link_libraries(paltest_setcurrentdirectorya_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt index 243e80b9a4..587ea20cf8 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setcurrentdirectorya_test2 add_dependencies(paltest_setcurrentdirectorya_test2 coreclrpal) target_link_libraries(paltest_setcurrentdirectorya_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt index 8560ff0187..7e2f3ada33 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setcurrentdirectorya_test3 add_dependencies(paltest_setcurrentdirectorya_test3 coreclrpal) target_link_libraries(paltest_setcurrentdirectorya_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt index 9149221008..a68f87b5a0 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setcurrentdirectoryw_test1 add_dependencies(paltest_setcurrentdirectoryw_test1 coreclrpal) target_link_libraries(paltest_setcurrentdirectoryw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt index 455ddc828d..9cc5ba1a55 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setcurrentdirectoryw_test2 add_dependencies(paltest_setcurrentdirectoryw_test2 coreclrpal) target_link_libraries(paltest_setcurrentdirectoryw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt index 1cb1150a61..06da5a8106 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setcurrentdirectoryw_test3 add_dependencies(paltest_setcurrentdirectoryw_test3 coreclrpal) target_link_libraries(paltest_setcurrentdirectoryw_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt index 3c0fdeec22..5d9e8c0615 100644 --- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setendoffile_test1 add_dependencies(paltest_setendoffile_test1 coreclrpal) target_link_libraries(paltest_setendoffile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt index 57afdad2fd..47aa96c18a 100644 --- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setendoffile_test2 add_dependencies(paltest_setendoffile_test2 coreclrpal) target_link_libraries(paltest_setendoffile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt index 01575ce09b..87a2a47a61 100644 --- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setendoffile_test3 add_dependencies(paltest_setendoffile_test3 coreclrpal) target_link_libraries(paltest_setendoffile_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt index 1dc4f68aef..ca5f00fe2b 100644 --- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setendoffile_test4 add_dependencies(paltest_setendoffile_test4 coreclrpal) target_link_libraries(paltest_setendoffile_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt index 19f87a28af..390ee11f40 100644 --- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setendoffile_test5 add_dependencies(paltest_setendoffile_test5 coreclrpal) target_link_libraries(paltest_setendoffile_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt index 638dd5c425..b287ceca67 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesa_test1 add_dependencies(paltest_setfileattributesa_test1 coreclrpal) target_link_libraries(paltest_setfileattributesa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt index 51bee5af39..ace67dcbd1 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesa_test2 add_dependencies(paltest_setfileattributesa_test2 coreclrpal) target_link_libraries(paltest_setfileattributesa_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt index 4597e1d22c..eb054ac918 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesa_test3 add_dependencies(paltest_setfileattributesa_test3 coreclrpal) target_link_libraries(paltest_setfileattributesa_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt index 1807027123..d20ea5dc04 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesa_test4 add_dependencies(paltest_setfileattributesa_test4 coreclrpal) target_link_libraries(paltest_setfileattributesa_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt index 825554da74..4d867c1a58 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesw_test1 add_dependencies(paltest_setfileattributesw_test1 coreclrpal) target_link_libraries(paltest_setfileattributesw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt index fda1cec1d7..df1bbfad04 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesw_test2 add_dependencies(paltest_setfileattributesw_test2 coreclrpal) target_link_libraries(paltest_setfileattributesw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt index 1757f88bfe..f4cd725b71 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesw_test3 add_dependencies(paltest_setfileattributesw_test3 coreclrpal) target_link_libraries(paltest_setfileattributesw_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt index d1cfcdd07d..986954b7d8 100644 --- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfileattributesw_test4 add_dependencies(paltest_setfileattributesw_test4 coreclrpal) target_link_libraries(paltest_setfileattributesw_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt index bb09a981e9..c0594aac1a 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test1 add_dependencies(paltest_setfilepointer_test1 coreclrpal) target_link_libraries(paltest_setfilepointer_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt index 2e76f00c99..4299b808d7 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test2 add_dependencies(paltest_setfilepointer_test2 coreclrpal) target_link_libraries(paltest_setfilepointer_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt index bcc3faca09..04589ea0d7 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test3 add_dependencies(paltest_setfilepointer_test3 coreclrpal) target_link_libraries(paltest_setfilepointer_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt index 3fcc4066f2..6fc8116808 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test4 add_dependencies(paltest_setfilepointer_test4 coreclrpal) target_link_libraries(paltest_setfilepointer_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt index 3012009e4f..7584349035 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test5 add_dependencies(paltest_setfilepointer_test5 coreclrpal) target_link_libraries(paltest_setfilepointer_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt index a376acbe28..3e9f6496cc 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test6 add_dependencies(paltest_setfilepointer_test6 coreclrpal) target_link_libraries(paltest_setfilepointer_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt index 2b5c0bbb45..14f4910e3b 100644 --- a/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfilepointer_test7 add_dependencies(paltest_setfilepointer_test7 coreclrpal) target_link_libraries(paltest_setfilepointer_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt index b94bd05d76..e9d8dce966 100644 --- a/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfiletime_test1 add_dependencies(paltest_setfiletime_test1 coreclrpal) target_link_libraries(paltest_setfiletime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt index 5478aa3703..12ec26c9f8 100644 --- a/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfiletime_test2 add_dependencies(paltest_setfiletime_test2 coreclrpal) target_link_libraries(paltest_setfiletime_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt index 26e178a328..ca0ed659f5 100644 --- a/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfiletime_test3 add_dependencies(paltest_setfiletime_test3 coreclrpal) target_link_libraries(paltest_setfiletime_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt index b85a92bf63..432ebe594f 100644 --- a/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setfiletime_test4 add_dependencies(paltest_setfiletime_test4 coreclrpal) target_link_libraries(paltest_setfiletime_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt index 3d5a735a83..da7bbf7645 100644 --- a/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_writefile_test1 add_dependencies(paltest_writefile_test1 coreclrpal) target_link_libraries(paltest_writefile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt index 3d7d18826a..86530dea7d 100644 --- a/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_writefile_test2 add_dependencies(paltest_writefile_test2 coreclrpal) target_link_libraries(paltest_writefile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp b/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp index 24c148afb8..9345bc6c48 100644 --- a/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp +++ b/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp @@ -20,11 +20,7 @@ char* writeBuffer; const char* szWritableFile = "Writeable.txt"; const char* szResultsFile = "Results.txt"; -#ifdef __sparc__ -const int PAGESIZE = 8192; -#else // __sparc__ const int PAGESIZE = 4096; -#endif // __sparc__ BOOL writeTest(DWORD dwByteCount, DWORD dwBytesWrittenResult, BOOL bResult) { diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt index bffcf35482..143f537ad9 100644 --- a/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_writefile_test3 add_dependencies(paltest_writefile_test3 coreclrpal) target_link_libraries(paltest_writefile_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt index 402a61ac2c..b8e26ee57e 100644 --- a/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_writefile_test4 add_dependencies(paltest_writefile_test4 coreclrpal) target_link_libraries(paltest_writefile_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt index f1f5037f98..69d7034b89 100644 --- a/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_writefile_test5 add_dependencies(paltest_writefile_test5 coreclrpal) target_link_libraries(paltest_writefile_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt index 4c4f6416ce..14bed34639 100644 --- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_errorpathnotfound_test1 add_dependencies(paltest_errorpathnotfound_test1 coreclrpal) target_link_libraries(paltest_errorpathnotfound_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt index 284933f950..abbf494f07 100644 --- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_errorpathnotfound_test2 add_dependencies(paltest_errorpathnotfound_test2 coreclrpal) target_link_libraries(paltest_errorpathnotfound_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt index b418c9dbdb..a0e7dd60ef 100644 --- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_errorpathnotfound_test3 add_dependencies(paltest_errorpathnotfound_test3 coreclrpal) target_link_libraries(paltest_errorpathnotfound_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt index e0322dd8e4..00621296d0 100644 --- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_errorpathnotfound_test4 add_dependencies(paltest_errorpathnotfound_test4 coreclrpal) target_link_libraries(paltest_errorpathnotfound_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt index 9869c9c70f..9465bf2a4e 100644 --- a/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettemppatha_test1 add_dependencies(paltest_gettemppatha_test1 coreclrpal) target_link_libraries(paltest_gettemppatha_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt index c38015ea21..c098dad907 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test1 add_dependencies(paltest_createfilemappinga_test1 coreclrpal) target_link_libraries(paltest_createfilemappinga_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt index fc152c8161..4e57246487 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test3 add_dependencies(paltest_createfilemappinga_test3 coreclrpal) target_link_libraries(paltest_createfilemappinga_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt index bbb4deaa8b..d5d5c80213 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test4 add_dependencies(paltest_createfilemappinga_test4 coreclrpal) target_link_libraries(paltest_createfilemappinga_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt index b80aa21a42..96cd09f95c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test5 add_dependencies(paltest_createfilemappinga_test5 coreclrpal) target_link_libraries(paltest_createfilemappinga_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt index 414127aa35..383eb6e623 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test6 add_dependencies(paltest_createfilemappinga_test6 coreclrpal) target_link_libraries(paltest_createfilemappinga_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt index e40a5ad486..8f8a2a454c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test7 add_dependencies(paltest_createfilemappinga_test7 coreclrpal) target_link_libraries(paltest_createfilemappinga_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt index d2e2007545..5246d0d5fe 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test8 add_dependencies(paltest_createfilemappinga_test8 coreclrpal) target_link_libraries(paltest_createfilemappinga_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt index 3017dc4aa4..b0a8017011 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappinga_test9 add_dependencies(paltest_createfilemappinga_test9 coreclrpal) target_link_libraries(paltest_createfilemappinga_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt index 2d24eca8c8..7cafe0971c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_createfilemapping_neg1 add_dependencies(paltest_createfilemappingw_createfilemapping_neg1 coreclrpal) target_link_libraries(paltest_createfilemappingw_createfilemapping_neg1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt index a2fbfa39af..661fd5d3b5 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test1 add_dependencies(paltest_createfilemappingw_test1 coreclrpal) target_link_libraries(paltest_createfilemappingw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt index 8552cc910f..7fac43a4a5 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test2 add_dependencies(paltest_createfilemappingw_test2 coreclrpal) target_link_libraries(paltest_createfilemappingw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt index 97fd712350..1e95960679 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test3 add_dependencies(paltest_createfilemappingw_test3 coreclrpal) target_link_libraries(paltest_createfilemappingw_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt index 81f248e335..955678e45e 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test4 add_dependencies(paltest_createfilemappingw_test4 coreclrpal) target_link_libraries(paltest_createfilemappingw_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt index df25e29a4f..6201940df0 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test5 add_dependencies(paltest_createfilemappingw_test5 coreclrpal) target_link_libraries(paltest_createfilemappingw_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt index 852c508020..4f8d838687 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test6 add_dependencies(paltest_createfilemappingw_test6 coreclrpal) target_link_libraries(paltest_createfilemappingw_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt index 68be449aec..154f755721 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test7 add_dependencies(paltest_createfilemappingw_test7 coreclrpal) target_link_libraries(paltest_createfilemappingw_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt index 406331072c..bb9e1cedcc 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test8 add_dependencies(paltest_createfilemappingw_test8 coreclrpal) target_link_libraries(paltest_createfilemappingw_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt index 6d15fea1e6..241e9f02b3 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createfilemappingw_test9 add_dependencies(paltest_createfilemappingw_test9 coreclrpal) target_link_libraries(paltest_createfilemappingw_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt index beaee835c8..4a8b6daeb5 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt @@ -14,7 +14,5 @@ add_executable(paltest_freelibrary_test1 add_dependencies(paltest_freelibrary_test1 coreclrpal) target_link_libraries(paltest_freelibrary_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt index 0a5e700ba4..aa57e09265 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_freelibrary_test2 add_dependencies(paltest_freelibrary_test2 coreclrpal) target_link_libraries(paltest_freelibrary_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt index 03bfe06eb3..338aaf774c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt @@ -14,7 +14,5 @@ add_executable(paltest_freelibraryandexitthread_test1 add_dependencies(paltest_freelibraryandexitthread_test1 coreclrpal) target_link_libraries(paltest_freelibraryandexitthread_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt index 9b7a610f0c..27eaec18dc 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getmodulefilenamea_test1 add_dependencies(paltest_getmodulefilenamea_test1 coreclrpal) target_link_libraries(paltest_getmodulefilenamea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt index 1909be4b42..e908eaf008 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getmodulefilenamea_test2 add_dependencies(paltest_getmodulefilenamea_test2 coreclrpal) target_link_libraries(paltest_getmodulefilenamea_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt index f3d92b15c9..6afc44e23f 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getmodulefilenamew_test1 add_dependencies(paltest_getmodulefilenamew_test1 coreclrpal) target_link_libraries(paltest_getmodulefilenamew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt index 7b23e92772..50a4dd8c10 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getmodulefilenamew_test2 add_dependencies(paltest_getmodulefilenamew_test2 coreclrpal) target_link_libraries(paltest_getmodulefilenamew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt index 3dedba3cce..a9a985fb03 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt @@ -14,7 +14,5 @@ add_executable(paltest_getprocaddress_test1 add_dependencies(paltest_getprocaddress_test1 coreclrpal) target_link_libraries(paltest_getprocaddress_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt index 983c16f12f..0069161250 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt @@ -14,7 +14,5 @@ add_executable(paltest_getprocaddress_test2 add_dependencies(paltest_getprocaddress_test2 coreclrpal) target_link_libraries(paltest_getprocaddress_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt index 3e9c725f95..d312ae95ee 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getprocessheap_test1 add_dependencies(paltest_getprocessheap_test1 coreclrpal) target_link_libraries(paltest_getprocessheap_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt index b9ce32b35e..69ee8bbe8f 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heapalloc_test1 add_dependencies(paltest_heapalloc_test1 coreclrpal) target_link_libraries(paltest_heapalloc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt index 1b9655ddba..f8084adf3c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heapalloc_test2 add_dependencies(paltest_heapalloc_test2 coreclrpal) target_link_libraries(paltest_heapalloc_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt index 1c3845c6e9..81bd6def24 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heapalloc_test3 add_dependencies(paltest_heapalloc_test3 coreclrpal) target_link_libraries(paltest_heapalloc_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt index 004912256c..3f61a2f215 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heapfree_test1 add_dependencies(paltest_heapfree_test1 coreclrpal) target_link_libraries(paltest_heapfree_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt index 17e0127435..acdb24e9ed 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heaprealloc_test1 add_dependencies(paltest_heaprealloc_test1 coreclrpal) target_link_libraries(paltest_heaprealloc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt index a9239354ba..c2ce80b40d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heaprealloc_test2 add_dependencies(paltest_heaprealloc_test2 coreclrpal) target_link_libraries(paltest_heaprealloc_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt index 2d82b6efdd..7982b05c68 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heaprealloc_test3 add_dependencies(paltest_heaprealloc_test3 coreclrpal) target_link_libraries(paltest_heaprealloc_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt index 129d8a47cd..f178dacca7 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heaprealloc_test4 add_dependencies(paltest_heaprealloc_test4 coreclrpal) target_link_libraries(paltest_heaprealloc_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt index ed3d390625..2a493525a1 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_heaprealloc_test5 add_dependencies(paltest_heaprealloc_test5 coreclrpal) target_link_libraries(paltest_heaprealloc_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt index f74e442d76..07d0c01c05 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_localalloc_test1 add_dependencies(paltest_localalloc_test1 coreclrpal) target_link_libraries(paltest_localalloc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt index d92939c7cc..5e7aac4f57 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_localfree_test1 add_dependencies(paltest_localfree_test1 coreclrpal) target_link_libraries(paltest_localfree_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt index e087b08ad7..1f04c7ab2d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_localfree_test2 add_dependencies(paltest_localfree_test2 coreclrpal) target_link_libraries(paltest_localfree_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt index 1d08065b2a..a9b8869c37 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_lockfile_test1 add_dependencies(paltest_lockfile_test1 coreclrpal) target_link_libraries(paltest_lockfile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_lockfile_test1_helper add_dependencies(paltest_lockfile_test1_helper coreclrpal) target_link_libraries(paltest_lockfile_test1_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) \ No newline at end of file diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt index ca5e5faed4..42e88c5999 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_lockfile_test2 add_dependencies(paltest_lockfile_test2 coreclrpal) target_link_libraries(paltest_lockfile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt index 117c715084..299e8cf76c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_lockfile_test3 add_dependencies(paltest_lockfile_test3 coreclrpal) target_link_libraries(paltest_lockfile_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_lockfile_test3_helper add_dependencies(paltest_lockfile_test3_helper coreclrpal) target_link_libraries(paltest_lockfile_test3_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt index aee1b1a0be..55cf9c64f7 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_lockfile_test4 add_dependencies(paltest_lockfile_test4 coreclrpal) target_link_libraries(paltest_lockfile_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt index 70e3db4561..82a174907e 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_lockfile_test5 add_dependencies(paltest_lockfile_test5 coreclrpal) target_link_libraries(paltest_lockfile_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_lockfile_test5_helper add_dependencies(paltest_lockfile_test5_helper coreclrpal) target_link_libraries(paltest_lockfile_test5_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt index 255ecbcc8d..fc5f90113e 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_lockfile_test6 add_dependencies(paltest_lockfile_test6 coreclrpal) target_link_libraries(paltest_lockfile_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_lockfile_test6_helper add_dependencies(paltest_lockfile_test6_helper coreclrpal) target_link_libraries(paltest_lockfile_test6_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt index 68a5b9f659..c52bf55ba8 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_lockfile_test7 add_dependencies(paltest_lockfile_test7 coreclrpal) target_link_libraries(paltest_lockfile_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt index 01679e5387..bdd664f0ab 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mapviewoffile_test1 add_dependencies(paltest_mapviewoffile_test1 coreclrpal) target_link_libraries(paltest_mapviewoffile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt index 88f3344567..c24ade8ff6 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mapviewoffile_test2 add_dependencies(paltest_mapviewoffile_test2 coreclrpal) target_link_libraries(paltest_mapviewoffile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt index e48ce13408..ce8ca02c40 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mapviewoffile_test3 add_dependencies(paltest_mapviewoffile_test3 coreclrpal) target_link_libraries(paltest_mapviewoffile_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt index 7f6d905212..29a0a1d8b9 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mapviewoffile_test4 add_dependencies(paltest_mapviewoffile_test4 coreclrpal) target_link_libraries(paltest_mapviewoffile_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt index 3911ffa53c..836a3c9612 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mapviewoffile_test5 add_dependencies(paltest_mapviewoffile_test5 coreclrpal) target_link_libraries(paltest_mapviewoffile_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt index 8199981eec..e3a7d09dfa 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_mapviewoffile_test6 add_dependencies(paltest_mapviewoffile_test6 coreclrpal) target_link_libraries(paltest_mapviewoffile_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt index e4d87d5e0f..5f0362607d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openfilemappinga_test1 add_dependencies(paltest_openfilemappinga_test1 coreclrpal) target_link_libraries(paltest_openfilemappinga_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt index 670346fe3b..f8c08e9c98 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openfilemappinga_test2 add_dependencies(paltest_openfilemappinga_test2 coreclrpal) target_link_libraries(paltest_openfilemappinga_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt index dab27b5c74..7357262e1c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openfilemappinga_test3 add_dependencies(paltest_openfilemappinga_test3 coreclrpal) target_link_libraries(paltest_openfilemappinga_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt index b2f4494ad8..25a6b4ca57 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openfilemappingw_test1 add_dependencies(paltest_openfilemappingw_test1 coreclrpal) target_link_libraries(paltest_openfilemappingw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt index 655fa753f2..f7ca6cf445 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openfilemappingw_test2 add_dependencies(paltest_openfilemappingw_test2 coreclrpal) target_link_libraries(paltest_openfilemappingw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt index a7039a1c73..002ea05d02 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openfilemappingw_test3 add_dependencies(paltest_openfilemappingw_test3 coreclrpal) target_link_libraries(paltest_openfilemappingw_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt index e96c92e2ae..cdd8be0267 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/ProbeMemory_neg1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_probememory_probememory_neg1 add_dependencies(paltest_probememory_probememory_neg1 coreclrpal) target_link_libraries(paltest_probememory_probememory_neg1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt index 739ba62284..8103b1ecbc 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/ProbeMemory/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_probememory_test1 add_dependencies(paltest_probememory_test1 coreclrpal) target_link_libraries(paltest_probememory_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt index 8aa1c80368..12aba80d0a 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rtlmovememory_test1 add_dependencies(paltest_rtlmovememory_test1 coreclrpal) target_link_libraries(paltest_rtlmovememory_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt index d292cff494..3773cb79cd 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rtlmovememory_test3 add_dependencies(paltest_rtlmovememory_test3 coreclrpal) target_link_libraries(paltest_rtlmovememory_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt index e8aeb0c0b3..0b4414b08b 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rtlmovememory_test4 add_dependencies(paltest_rtlmovememory_test4 coreclrpal) target_link_libraries(paltest_rtlmovememory_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt index 7f4986eb27..f3c38f2e6a 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_rtlmovememory_test5 add_dependencies(paltest_rtlmovememory_test5 coreclrpal) target_link_libraries(paltest_rtlmovememory_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt index 8ed46bae43..58b0329d0d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_unlockfile_test1 add_dependencies(paltest_unlockfile_test1 coreclrpal) target_link_libraries(paltest_unlockfile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_unlockfile_test1_helper add_dependencies(paltest_unlockfile_test1_helper coreclrpal) target_link_libraries(paltest_unlockfile_test1_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) \ No newline at end of file diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt index 3033876f80..251d21ba65 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_unlockfile_test2 add_dependencies(paltest_unlockfile_test2 coreclrpal) target_link_libraries(paltest_unlockfile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt index d46d7db344..980a9b0f75 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_unlockfile_test3 add_dependencies(paltest_unlockfile_test3 coreclrpal) target_link_libraries(paltest_unlockfile_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_unlockfile_test3_helper add_dependencies(paltest_unlockfile_test3_helper coreclrpal) target_link_libraries(paltest_unlockfile_test3_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt index 635a1ca07c..e721b04b6c 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_unlockfile_test4 add_dependencies(paltest_unlockfile_test4 coreclrpal) target_link_libraries(paltest_unlockfile_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt index 1b8062ff9c..f2402bee8d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_unmapviewoffile_test1 add_dependencies(paltest_unmapviewoffile_test1 coreclrpal) target_link_libraries(paltest_unmapviewoffile_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt index 750e446a17..8aa842968f 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_unmapviewoffile_test2 add_dependencies(paltest_unmapviewoffile_test2 coreclrpal) target_link_libraries(paltest_unmapviewoffile_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt index f8c0645a4b..9fe73ac005 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test1 add_dependencies(paltest_virtualalloc_test1 coreclrpal) target_link_libraries(paltest_virtualalloc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt index 1b66f0d7cb..6ccecb60b5 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test10 add_dependencies(paltest_virtualalloc_test10 coreclrpal) target_link_libraries(paltest_virtualalloc_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt index 95e1a06f55..fe848f0c48 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test11 add_dependencies(paltest_virtualalloc_test11 coreclrpal) target_link_libraries(paltest_virtualalloc_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt index 7564f960fe..dc59a294a9 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test12 add_dependencies(paltest_virtualalloc_test12 coreclrpal) target_link_libraries(paltest_virtualalloc_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt index a49dcfc81d..04cf162f39 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test13 add_dependencies(paltest_virtualalloc_test13 coreclrpal) target_link_libraries(paltest_virtualalloc_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt index 180a48e74d..0f18f9722b 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test14 add_dependencies(paltest_virtualalloc_test14 coreclrpal) target_link_libraries(paltest_virtualalloc_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt index 4ba219472e..56f8be6529 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test15 add_dependencies(paltest_virtualalloc_test15 coreclrpal) target_link_libraries(paltest_virtualalloc_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt index 1c5f63dce5..9b00d20d8b 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test16 add_dependencies(paltest_virtualalloc_test16 coreclrpal) target_link_libraries(paltest_virtualalloc_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt index 6523bb9292..07be5b3d37 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test17 add_dependencies(paltest_virtualalloc_test17 coreclrpal) target_link_libraries(paltest_virtualalloc_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt index 3fe65b4ac8..b6196846c2 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test18 add_dependencies(paltest_virtualalloc_test18 coreclrpal) target_link_libraries(paltest_virtualalloc_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt index 1795b8ba54..27690a2ebe 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test19 add_dependencies(paltest_virtualalloc_test19 coreclrpal) target_link_libraries(paltest_virtualalloc_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt index 20da178bfc..8637ef84e8 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test2 add_dependencies(paltest_virtualalloc_test2 coreclrpal) target_link_libraries(paltest_virtualalloc_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt index 5c23fe2b0d..83cadbe3d7 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test20 add_dependencies(paltest_virtualalloc_test20 coreclrpal) target_link_libraries(paltest_virtualalloc_test20 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt index 96a3144e8a..437e06435e 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test21 add_dependencies(paltest_virtualalloc_test21 coreclrpal) target_link_libraries(paltest_virtualalloc_test21 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt index cdad2ca19d..7c6cf0c881 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test22/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test22 add_dependencies(paltest_virtualalloc_test22 coreclrpal) target_link_libraries(paltest_virtualalloc_test22 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt index 77822f7862..8ca013c6a5 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test3 add_dependencies(paltest_virtualalloc_test3 coreclrpal) target_link_libraries(paltest_virtualalloc_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt index 0e2c448659..3c6c689208 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test4 add_dependencies(paltest_virtualalloc_test4 coreclrpal) target_link_libraries(paltest_virtualalloc_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt index 247053ff0f..5646ec57b9 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test5 add_dependencies(paltest_virtualalloc_test5 coreclrpal) target_link_libraries(paltest_virtualalloc_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt index d19391d294..1dbadc95af 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test6 add_dependencies(paltest_virtualalloc_test6 coreclrpal) target_link_libraries(paltest_virtualalloc_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt index 8c01e041de..e4ccebf5ac 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test7 add_dependencies(paltest_virtualalloc_test7 coreclrpal) target_link_libraries(paltest_virtualalloc_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt index db2a7447be..e94e081223 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test8 add_dependencies(paltest_virtualalloc_test8 coreclrpal) target_link_libraries(paltest_virtualalloc_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt index 254fc6fcf2..7639adfc9d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualalloc_test9 add_dependencies(paltest_virtualalloc_test9 coreclrpal) target_link_libraries(paltest_virtualalloc_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt index d2319506f2..e16a7ff408 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualfree_test1 add_dependencies(paltest_virtualfree_test1 coreclrpal) target_link_libraries(paltest_virtualfree_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt index 9a3bc7ac61..576dc05d10 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualfree_test2 add_dependencies(paltest_virtualfree_test2 coreclrpal) target_link_libraries(paltest_virtualfree_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt index 8484c0fd94..b56ed07140 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualfree_test3 add_dependencies(paltest_virtualfree_test3 coreclrpal) target_link_libraries(paltest_virtualfree_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt index 4283398a6f..2e3d26c744 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualprotect_test1 add_dependencies(paltest_virtualprotect_test1 coreclrpal) target_link_libraries(paltest_virtualprotect_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt index aed68fd27f..4064bb5ecb 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualprotect_test2 add_dependencies(paltest_virtualprotect_test2 coreclrpal) target_link_libraries(paltest_virtualprotect_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt index 70728592ad..11347b92e7 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualprotect_test3 add_dependencies(paltest_virtualprotect_test3 coreclrpal) target_link_libraries(paltest_virtualprotect_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt index 5ad64a74eb..ed891093f8 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualprotect_test4 add_dependencies(paltest_virtualprotect_test4 coreclrpal) target_link_libraries(paltest_virtualprotect_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt index 78932ef453..5fc3da928b 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualprotect_test6 add_dependencies(paltest_virtualprotect_test6 coreclrpal) target_link_libraries(paltest_virtualprotect_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt index caf5ef91f4..8f47e60298 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualprotect_test7 add_dependencies(paltest_virtualprotect_test7 coreclrpal) target_link_libraries(paltest_virtualprotect_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt index 17cbdee4a5..16ec598f3d 100644 --- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_virtualquery_test1 add_dependencies(paltest_virtualquery_test1 coreclrpal) target_link_libraries(paltest_virtualquery_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt index 62b896df65..319dcab325 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibrarya_test1 add_dependencies(paltest_loadlibrarya_test1 coreclrpal) target_link_libraries(paltest_loadlibrarya_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt index 48a4c36cd0..e82b88a47f 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibrarya_test2 add_dependencies(paltest_loadlibrarya_test2 coreclrpal) target_link_libraries(paltest_loadlibrarya_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt index ae05b3560d..084dcbc5f5 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibrarya_test3 add_dependencies(paltest_loadlibrarya_test3 coreclrpal) target_link_libraries(paltest_loadlibrarya_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt index 99915eea2c..7555d26ef8 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibrarya_test5 add_dependencies(paltest_loadlibrarya_test5 coreclrpal) target_link_libraries(paltest_loadlibrarya_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt index 0fac8785a8..c256ff567f 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_loadlibrarya_test6 add_dependencies(paltest_loadlibrarya_test6 coreclrpal) target_link_libraries(paltest_loadlibrarya_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_loadlibrarya_test6_dlltest add_dependencies(paltest_loadlibrarya_test6_dlltest coreclrpal) target_link_libraries(paltest_loadlibrarya_test6_dlltest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt index bb403c6466..154f26f6f6 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibrarya_test7 add_dependencies(paltest_loadlibrarya_test7 coreclrpal) target_link_libraries(paltest_loadlibrarya_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt index 9e3449166b..2bdbfb5705 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_loadlibrarya_test8 add_dependencies(paltest_loadlibrarya_test8 coreclrpal) target_link_libraries(paltest_loadlibrarya_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_loadlibrarya_test8_dlltest add_dependencies(paltest_loadlibrarya_test8_dlltest coreclrpal) target_link_libraries(paltest_loadlibrarya_test8_dlltest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt index 171d1d59d4..569f6f7921 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibraryw_test1 add_dependencies(paltest_loadlibraryw_test1 coreclrpal) target_link_libraries(paltest_loadlibraryw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt index 9873e1332d..e37f19a45c 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibraryw_test2 add_dependencies(paltest_loadlibraryw_test2 coreclrpal) target_link_libraries(paltest_loadlibraryw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt index be758643fa..73638dd626 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibraryw_test3 add_dependencies(paltest_loadlibraryw_test3 coreclrpal) target_link_libraries(paltest_loadlibraryw_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt index 1ca990b514..5ab178d878 100644 --- a/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_loadlibraryw_test5 add_dependencies(paltest_loadlibraryw_test5 coreclrpal) target_link_libraries(paltest_loadlibraryw_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt index 171d5b77e8..2ea8b71aee 100644 --- a/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_comparestringa_test1 add_dependencies(paltest_comparestringa_test1 coreclrpal) target_link_libraries(paltest_comparestringa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt index 15a7fe7685..8f283a55db 100644 --- a/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_comparestringw_test1 add_dependencies(paltest_comparestringw_test1 coreclrpal) target_link_libraries(paltest_comparestringw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt index cf4431ea94..be766d7e8e 100644 --- a/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getacp_test1 add_dependencies(paltest_getacp_test1 coreclrpal) target_link_libraries(paltest_getacp_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt index b4cf017c2b..e8c9077598 100644 --- a/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcpinfo_test1 add_dependencies(paltest_getcpinfo_test1 coreclrpal) target_link_libraries(paltest_getcpinfo_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt index b366f3ce8d..3ce744e942 100644 --- a/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcpinfo_test2 add_dependencies(paltest_getcpinfo_test2 coreclrpal) target_link_libraries(paltest_getcpinfo_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt index 032dd00290..fe17e33578 100644 --- a/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcpinfo_test3 add_dependencies(paltest_getcpinfo_test3 coreclrpal) target_link_libraries(paltest_getcpinfo_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt index 4f685cb8a4..ea574a8bdb 100644 --- a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getlocaleinfow_test1 add_dependencies(paltest_getlocaleinfow_test1 coreclrpal) target_link_libraries(paltest_getlocaleinfow_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt index 7851b36b96..10d81bcad7 100644 --- a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getlocaleinfow_test2 add_dependencies(paltest_getlocaleinfow_test2 coreclrpal) target_link_libraries(paltest_getlocaleinfow_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt index e68621681a..9d6e4e2be8 100644 --- a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getstringtypeexw_test1 add_dependencies(paltest_getstringtypeexw_test1 coreclrpal) target_link_libraries(paltest_getstringtypeexw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt index e37b7495d0..7f90601ef9 100644 --- a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getstringtypeexw_test2 add_dependencies(paltest_getstringtypeexw_test2 coreclrpal) target_link_libraries(paltest_getstringtypeexw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt index e34e1837e0..acbe40d847 100644 --- a/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getsystemdefaultlangid_test1 add_dependencies(paltest_getsystemdefaultlangid_test1 coreclrpal) target_link_libraries(paltest_getsystemdefaultlangid_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt index 8abbd822c2..b6d0f270d8 100644 --- a/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getthreadlocale_test1 add_dependencies(paltest_getthreadlocale_test1 coreclrpal) target_link_libraries(paltest_getthreadlocale_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt index 8bf0a6ca23..d62a4c22aa 100644 --- a/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettimezoneinformation_test1 add_dependencies(paltest_gettimezoneinformation_test1 coreclrpal) target_link_libraries(paltest_gettimezoneinformation_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt index b6f08b1f7d..256d818778 100644 --- a/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getuserdefaultlcid_test1 add_dependencies(paltest_getuserdefaultlcid_test1 coreclrpal) target_link_libraries(paltest_getuserdefaultlcid_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt index 8fc795a52b..ac3c78a2bd 100644 --- a/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getuserdefaultlangid_test1 add_dependencies(paltest_getuserdefaultlangid_test1 coreclrpal) target_link_libraries(paltest_getuserdefaultlangid_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt index e9b22dcfc5..2264d3e8f7 100644 --- a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isdbcsleadbyte_test1 add_dependencies(paltest_isdbcsleadbyte_test1 coreclrpal) target_link_libraries(paltest_isdbcsleadbyte_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt index f3a232b143..3109b71737 100644 --- a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isdbcsleadbyteex_test1 add_dependencies(paltest_isdbcsleadbyteex_test1 coreclrpal) target_link_libraries(paltest_isdbcsleadbyteex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt index ae12b37950..a90784818a 100644 --- a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isvalidcodepage_test1 add_dependencies(paltest_isvalidcodepage_test1 coreclrpal) target_link_libraries(paltest_isvalidcodepage_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt index 6eeff25d4d..5cf6d4c7ae 100644 --- a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isvalidcodepage_test2 add_dependencies(paltest_isvalidcodepage_test2 coreclrpal) target_link_libraries(paltest_isvalidcodepage_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt index 27d61693b0..f9e1c884a0 100644 --- a/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_isvalidlocale_test1 add_dependencies(paltest_isvalidlocale_test1 coreclrpal) target_link_libraries(paltest_isvalidlocale_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt index 7bf79e36a7..f400843bd2 100644 --- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_multibytetowidechar_test1 add_dependencies(paltest_multibytetowidechar_test1 coreclrpal) target_link_libraries(paltest_multibytetowidechar_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt index b3e3f64c5c..c51cfd6469 100644 --- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_multibytetowidechar_test2 add_dependencies(paltest_multibytetowidechar_test2 coreclrpal) target_link_libraries(paltest_multibytetowidechar_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt index c6eac9bd60..386425f90f 100644 --- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_multibytetowidechar_test3 add_dependencies(paltest_multibytetowidechar_test3 coreclrpal) target_link_libraries(paltest_multibytetowidechar_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt index c9c92952f2..dc119abd08 100644 --- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_multibytetowidechar_test4 add_dependencies(paltest_multibytetowidechar_test4 coreclrpal) target_link_libraries(paltest_multibytetowidechar_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) \ No newline at end of file diff --git a/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt index 5ac7433c98..7b0cde4a14 100644 --- a/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setthreadlocale_test1 add_dependencies(paltest_setthreadlocale_test1 coreclrpal) target_link_libraries(paltest_setthreadlocale_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt index 07dae640f1..913cccc8e1 100644 --- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_widechartomultibyte_test1 add_dependencies(paltest_widechartomultibyte_test1 coreclrpal) target_link_libraries(paltest_widechartomultibyte_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt index 99c64afa2a..305348cd12 100644 --- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_widechartomultibyte_test2 add_dependencies(paltest_widechartomultibyte_test2 coreclrpal) target_link_libraries(paltest_widechartomultibyte_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt index 70dabead6f..f5a8bf9774 100644 --- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_widechartomultibyte_test3 add_dependencies(paltest_widechartomultibyte_test3 coreclrpal) target_link_libraries(paltest_widechartomultibyte_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt index 8839c19183..bea8e1aacf 100644 --- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_widechartomultibyte_test4 add_dependencies(paltest_widechartomultibyte_test4 coreclrpal) target_link_libraries(paltest_widechartomultibyte_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt index e00657879d..51851e45d6 100644 --- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_widechartomultibyte_test5 add_dependencies(paltest_widechartomultibyte_test5 coreclrpal) target_link_libraries(paltest_widechartomultibyte_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) \ No newline at end of file diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt index 23df52b430..aa7abfbee7 100644 --- a/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_charnexta_test1 add_dependencies(paltest_charnexta_test1 coreclrpal) target_link_libraries(paltest_charnexta_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt index 5f089e963c..3339e097d0 100644 --- a/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_charnexta_test2 add_dependencies(paltest_charnexta_test2 coreclrpal) target_link_libraries(paltest_charnexta_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt index ae1433f089..959a661b7a 100644 --- a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_charnextexa_test1 add_dependencies(paltest_charnextexa_test1 coreclrpal) target_link_libraries(paltest_charnextexa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt index 1c81d1f9a4..7c0427127c 100644 --- a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_charnextexa_test2 add_dependencies(paltest_charnextexa_test2 coreclrpal) target_link_libraries(paltest_charnextexa_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt index 78bb701959..f35d6fb10e 100644 --- a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_closehandle_test1 add_dependencies(paltest_closehandle_test1 coreclrpal) target_link_libraries(paltest_closehandle_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt index 18350f20ad..691d44b82a 100644 --- a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_closehandle_test2 add_dependencies(paltest_closehandle_test2 coreclrpal) target_link_libraries(paltest_closehandle_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt index 15a0f572bb..494c948aba 100644 --- a/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createpipe_test1 add_dependencies(paltest_createpipe_test1 coreclrpal) target_link_libraries(paltest_createpipe_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt index 47ee4b0abd..57b925c8a7 100644 --- a/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_flushinstructioncache_test1 add_dependencies(paltest_flushinstructioncache_test1 coreclrpal) target_link_libraries(paltest_flushinstructioncache_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt index df91482855..f0e366ec86 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_formatmessagew_test1 add_dependencies(paltest_formatmessagew_test1 coreclrpal) target_link_libraries(paltest_formatmessagew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt index 818649aac7..564830acdf 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_formatmessagew_test2 add_dependencies(paltest_formatmessagew_test2 coreclrpal) target_link_libraries(paltest_formatmessagew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp index 6c2d80b3f4..d45dc92f04 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp @@ -460,7 +460,7 @@ int test11(int num, ...) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); if(memcmp(OutBuffer, convert("Pal 00000000000123AB and foo Testing"), diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt index 516d4bcc9a..70b039bf03 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_formatmessagew_test3 add_dependencies(paltest_formatmessagew_test3 coreclrpal) target_link_libraries(paltest_formatmessagew_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt index 642727c6dc..c4ecccf7d0 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_formatmessagew_test4 add_dependencies(paltest_formatmessagew_test4 coreclrpal) target_link_libraries(paltest_formatmessagew_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt index bae113475d..2d4e2a2c44 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_formatmessagew_test5 add_dependencies(paltest_formatmessagew_test5 coreclrpal) target_link_libraries(paltest_formatmessagew_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt index f403cba0f4..33ca130e26 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_formatmessagew_test6 add_dependencies(paltest_formatmessagew_test6 coreclrpal) target_link_libraries(paltest_formatmessagew_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt index 206707efa6..081df32533 100644 --- a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_freeenvironmentstringsw_test1 add_dependencies(paltest_freeenvironmentstringsw_test1 coreclrpal) target_link_libraries(paltest_freeenvironmentstringsw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt index d8197d1c90..7a69e103fa 100644 --- a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_freeenvironmentstringsw_test2 add_dependencies(paltest_freeenvironmentstringsw_test2 coreclrpal) target_link_libraries(paltest_freeenvironmentstringsw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt index 92cabba428..11c278015c 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcalendarinfow_test1 add_dependencies(paltest_getcalendarinfow_test1 coreclrpal) target_link_libraries(paltest_getcalendarinfow_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt index 0cfc9679e7..2abf2901c0 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcalendarinfow_test2 add_dependencies(paltest_getcalendarinfow_test2 coreclrpal) target_link_libraries(paltest_getcalendarinfow_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt index d15b84a59e..6d00bf85c3 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcommandlinew_test1 add_dependencies(paltest_getcommandlinew_test1 coreclrpal) target_link_libraries(paltest_getcommandlinew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt index 0ce9ac07b7..fe5b72071e 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcomputernamew_test1 add_dependencies(paltest_getcomputernamew_test1 coreclrpal) target_link_libraries(paltest_getcomputernamew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt index 04ef85b74d..9d9512ce78 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getdateformatw_getdateformatw_neg1 add_dependencies(paltest_getdateformatw_getdateformatw_neg1 coreclrpal) target_link_libraries(paltest_getdateformatw_getdateformatw_neg1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt index fcd56fc7f2..dc4215ea57 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getdateformatw_getdateformatw_neg2 add_dependencies(paltest_getdateformatw_getdateformatw_neg2 coreclrpal) target_link_libraries(paltest_getdateformatw_getdateformatw_neg2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt index bd86370611..b392d02ca4 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getdateformatw_test1 add_dependencies(paltest_getdateformatw_test1 coreclrpal) target_link_libraries(paltest_getdateformatw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt index 3a745fdbd3..378390b150 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentstringsw_test1 add_dependencies(paltest_getenvironmentstringsw_test1 coreclrpal) target_link_libraries(paltest_getenvironmentstringsw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt index 0721fd60b7..2af3c9de8a 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablea_test1 add_dependencies(paltest_getenvironmentvariablea_test1 coreclrpal) target_link_libraries(paltest_getenvironmentvariablea_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt index a9be983369..64da266af2 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablea_test2 add_dependencies(paltest_getenvironmentvariablea_test2 coreclrpal) target_link_libraries(paltest_getenvironmentvariablea_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt index 1c35eba54d..65ff937365 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablea_test3 add_dependencies(paltest_getenvironmentvariablea_test3 coreclrpal) target_link_libraries(paltest_getenvironmentvariablea_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt index 331ea8ca6b..df7697beff 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablea_test4 add_dependencies(paltest_getenvironmentvariablea_test4 coreclrpal) target_link_libraries(paltest_getenvironmentvariablea_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt index 69bedf4947..8e6e26363e 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablea_test5 add_dependencies(paltest_getenvironmentvariablea_test5 coreclrpal) target_link_libraries(paltest_getenvironmentvariablea_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt index 38c186740f..ac25f769fd 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablea_test6 add_dependencies(paltest_getenvironmentvariablea_test6 coreclrpal) target_link_libraries(paltest_getenvironmentvariablea_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt index a3cb878ef4..e87cbf4da0 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablew_test1 add_dependencies(paltest_getenvironmentvariablew_test1 coreclrpal) target_link_libraries(paltest_getenvironmentvariablew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt index 2c6ec6247e..2e6f61a4ba 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablew_test2 add_dependencies(paltest_getenvironmentvariablew_test2 coreclrpal) target_link_libraries(paltest_getenvironmentvariablew_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt index 6af382b6cd..70151c419d 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablew_test3 add_dependencies(paltest_getenvironmentvariablew_test3 coreclrpal) target_link_libraries(paltest_getenvironmentvariablew_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt index 674b187fa7..56de6a1cc2 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablew_test4 add_dependencies(paltest_getenvironmentvariablew_test4 coreclrpal) target_link_libraries(paltest_getenvironmentvariablew_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt index 71e974703b..9d73780c97 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablew_test5 add_dependencies(paltest_getenvironmentvariablew_test5 coreclrpal) target_link_libraries(paltest_getenvironmentvariablew_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt index 8771ab0cc8..f331a89742 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getenvironmentvariablew_test6 add_dependencies(paltest_getenvironmentvariablew_test6 coreclrpal) target_link_libraries(paltest_getenvironmentvariablew_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt index 3c851c7260..1bf6407318 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getlasterror_test1 add_dependencies(paltest_getlasterror_test1 coreclrpal) target_link_libraries(paltest_getlasterror_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt index 9419517128..3fd07c4ded 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getsysteminfo_test1 add_dependencies(paltest_getsysteminfo_test1 coreclrpal) target_link_libraries(paltest_getsysteminfo_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt index f7be23bc0b..fcf7cb4c03 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_gettickcount_test1 add_dependencies(paltest_gettickcount_test1 coreclrpal) target_link_libraries(paltest_gettickcount_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt index 8ed7ace073..6527b83d13 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getusernamew_test1 add_dependencies(paltest_getusernamew_test1 coreclrpal) target_link_libraries(paltest_getusernamew_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt index 2cb305f22b..1e512f3c2f 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getversionexa_test1 add_dependencies(paltest_getversionexa_test1 coreclrpal) target_link_libraries(paltest_getversionexa_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt index 09494240cc..4ef820c479 100644 --- a/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getversionexw_test1 add_dependencies(paltest_getversionexw_test1 coreclrpal) target_link_libraries(paltest_getversionexw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt index e5ba709c11..47af14e0fc 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedexchangeadd_test1 add_dependencies(paltest_interlockedexchangeadd_test1 coreclrpal) target_link_libraries(paltest_interlockedexchangeadd_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp index ca9e5bb5bf..a68a1f609e 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp @@ -36,7 +36,7 @@ int __cdecl main(int argc, char *argv[]) -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) ptrValue = (LONG *) malloc(sizeof(LONG)); if(ptrValue == NULL) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt index a70802ea2d..2fe88a3fad 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedbit_test1 add_dependencies(paltest_interlockedbit_test1 coreclrpal) target_link_libraries(paltest_interlockedbit_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt index 6b50a755fe..3a6854b84b 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedBit/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedbit_test2 add_dependencies(paltest_interlockedbit_test2 coreclrpal) target_link_libraries(paltest_interlockedbit_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt index d9e867256a..e62ba779dc 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedcompareexchange_test1 add_dependencies(paltest_interlockedcompareexchange_test1 coreclrpal) target_link_libraries(paltest_interlockedcompareexchange_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt index 038d375273..ef7d64f724 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedcompareexchange_test2 add_dependencies(paltest_interlockedcompareexchange_test2 coreclrpal) target_link_libraries(paltest_interlockedcompareexchange_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt index 722603eb4a..7778acd397 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedcompareexchange64_test1 add_dependencies(paltest_interlockedcompareexchange64_test1 coreclrpal) target_link_libraries(paltest_interlockedcompareexchange64_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp index 56430e60cf..bb5981c65b 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp @@ -42,7 +42,7 @@ int __cdecl main(int argc, char *argv[]) { /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) /* Compare START_VALUE with BaseVariableToManipulate, they're equal, so exchange */ @@ -55,18 +55,10 @@ int __cdecl main(int argc, char *argv[]) { /* Exchanged, these should be equal now */ if(BaseVariableToManipulate != ValueToExchange) { -#ifdef PLATFORM_UNIX Fail("ERROR: A successful compare and exchange should have occurred, " "making the variable have the value of %ll, as opposed to the " "current value of %ll.", ValueToExchange,BaseVariableToManipulate); -#else - Fail("ERROR: A successful compare and exchange should have occurred, " - "making the variable have the value of %I64, as opposed to the " - "current value of %d.", - ValueToExchange,BaseVariableToManipulate); - -#endif } /* Check to make sure it returns the original number which @@ -74,15 +66,9 @@ int __cdecl main(int argc, char *argv[]) { */ if(TheReturn != START_VALUE) { -#ifdef PLATFORM_UNIX Fail("ERROR: The return value after the first exchange should be the " "former value of the variable, which was %ll, but it is now %ll.", START_VALUE,TheReturn); -#else - Fail("ERROR: The return value after the first exchange should be the " - "former value of the variable, which was %I64, but it is now %I64.", - START_VALUE,TheReturn); -#endif } @@ -103,20 +89,13 @@ int __cdecl main(int argc, char *argv[]) { if(BaseVariableToManipulate != TempValue) { -#ifdef PLATFORM_UNIX Fail("ERROR: An attempted exchange should have failed due to " "the compare failing. But, it seems to have succeeded. The " "value should be %ll but is %ll in this case.", TempValue,BaseVariableToManipulate); -#else - Fail("ERROR: An attempted exchange should have failed due to " - "the compare failing. But, it seems to have succeeded. The " - "value should be %I64 but is %I64 in this case.", - TempValue,BaseVariableToManipulate); -#endif } -#endif //if defined(BIT64) && defined(PLATFORM_UNIX) +#endif //if defined(BIT64) PAL_Terminate(); return PASS; } diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt index f052ca0b27..0f8e390ac5 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_interlockedcompareexchange64_test2 add_dependencies(paltest_interlockedcompareexchange64_test2 coreclrpal) target_link_libraries(paltest_interlockedcompareexchange64_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp index 2440543631..b2b0b6337c 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp @@ -47,7 +47,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ - #if defined(BIT64) && defined(PLATFORM_UNIX) + #if defined(BIT64) //Create MAX_THREADS threads that will operate on the global counter for (i=0;i -#ifndef PLATFORM_UNIX -#define LLFORMAT "%I64u" -#else #define LLFORMAT "%llu" -#endif ULONGLONG dwCreateThreadTestParameter = 0; diff --git a/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt index 47877607b9..aed986fd54 100644 --- a/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createthread_test2 add_dependencies(paltest_createthread_test2 coreclrpal) target_link_libraries(paltest_createthread_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt index d454992e59..3986665254 100644 --- a/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_createthread_test3 add_dependencies(paltest_createthread_test3 coreclrpal) target_link_libraries(paltest_createthread_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt index 8d2c1441c4..204b316b20 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test1 add_dependencies(paltest_criticalsectionfunctions_test1 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt index e0f59f4207..dba47f6ee2 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test2 add_dependencies(paltest_criticalsectionfunctions_test2 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt index 11555ec484..599572b99b 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test3 add_dependencies(paltest_criticalsectionfunctions_test3 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt index 8aa18854b3..71c49248aa 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test4 add_dependencies(paltest_criticalsectionfunctions_test4 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt index 9474bcc6c9..16a0ccdb48 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test5 add_dependencies(paltest_criticalsectionfunctions_test5 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt index f4887ad67d..3f463940b7 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test6 add_dependencies(paltest_criticalsectionfunctions_test6 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt index ceb78a0512..21b813ba32 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test7 add_dependencies(paltest_criticalsectionfunctions_test7 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt index d3f271d677..a8ab4b0aaf 100644 --- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_criticalsectionfunctions_test8 add_dependencies(paltest_criticalsectionfunctions_test8 coreclrpal) target_link_libraries(paltest_criticalsectionfunctions_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt index 18b1927a4e..f5fb47c0f0 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test1 add_dependencies(paltest_duplicatehandle_test1 coreclrpal) target_link_libraries(paltest_duplicatehandle_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt index 98c7a273dc..135f1494a6 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test10 add_dependencies(paltest_duplicatehandle_test10 coreclrpal) target_link_libraries(paltest_duplicatehandle_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt index f47f9bc350..5584b9d1e7 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_duplicatehandle_test11 add_dependencies(paltest_duplicatehandle_test11 coreclrpal) target_link_libraries(paltest_duplicatehandle_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_duplicatehandle_test11_child add_dependencies(paltest_duplicatehandle_test11_child coreclrpal) target_link_libraries(paltest_duplicatehandle_test11_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt index 6a50a13265..fb5ed234ca 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test12 add_dependencies(paltest_duplicatehandle_test12 coreclrpal) target_link_libraries(paltest_duplicatehandle_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt index 9faa58a271..9668dfd109 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test2 add_dependencies(paltest_duplicatehandle_test2 coreclrpal) target_link_libraries(paltest_duplicatehandle_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt index b161b928d3..e44c2a2f76 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test3 add_dependencies(paltest_duplicatehandle_test3 coreclrpal) target_link_libraries(paltest_duplicatehandle_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt index 901151f4eb..2261e6e1cd 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test4 add_dependencies(paltest_duplicatehandle_test4 coreclrpal) target_link_libraries(paltest_duplicatehandle_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt index 94cd07f96f..72e77aab1d 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test5 add_dependencies(paltest_duplicatehandle_test5 coreclrpal) target_link_libraries(paltest_duplicatehandle_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt index a0dcae843c..620d788435 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test6 add_dependencies(paltest_duplicatehandle_test6 coreclrpal) target_link_libraries(paltest_duplicatehandle_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt index a222331fe7..fff3ba5284 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test7 add_dependencies(paltest_duplicatehandle_test7 coreclrpal) target_link_libraries(paltest_duplicatehandle_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt index 18ed969cb7..2fb32aa3f7 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test8 add_dependencies(paltest_duplicatehandle_test8 coreclrpal) target_link_libraries(paltest_duplicatehandle_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt index 0383a010ac..f2bca82933 100644 --- a/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_duplicatehandle_test9 add_dependencies(paltest_duplicatehandle_test9 coreclrpal) target_link_libraries(paltest_duplicatehandle_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt index f2d28e06ca..28f1247659 100644 --- a/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exitprocess_test1 add_dependencies(paltest_exitprocess_test1 coreclrpal) target_link_libraries(paltest_exitprocess_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt index 5281a02aa4..6b9202e581 100644 --- a/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exitprocess_test2 add_dependencies(paltest_exitprocess_test2 coreclrpal) target_link_libraries(paltest_exitprocess_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt index 3fca087d05..c4152181ce 100644 --- a/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exitprocess_test3 add_dependencies(paltest_exitprocess_test3 coreclrpal) target_link_libraries(paltest_exitprocess_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt index c34b5257ab..3f8531a33a 100644 --- a/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_exitthread_test1 add_dependencies(paltest_exitthread_test1 coreclrpal) target_link_libraries(paltest_exitthread_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt index 5e16d36082..606e02774c 100644 --- a/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_exitthread_test2 add_dependencies(paltest_exitthread_test2 coreclrpal) target_link_libraries(paltest_exitthread_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_exitthread_test2_child add_dependencies(paltest_exitthread_test2_child coreclrpal) target_link_libraries(paltest_exitthread_test2_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt index af4746bcb4..be17127c1a 100644 --- a/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentprocess_test1 add_dependencies(paltest_getcurrentprocess_test1 coreclrpal) target_link_libraries(paltest_getcurrentprocess_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt index 523320a53c..f1ac1e0d48 100644 --- a/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentprocessid_test1 add_dependencies(paltest_getcurrentprocessid_test1 coreclrpal) target_link_libraries(paltest_getcurrentprocessid_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt index 23af2edbca..dacb9b40c9 100644 --- a/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentthread_test1 add_dependencies(paltest_getcurrentthread_test1 coreclrpal) target_link_libraries(paltest_getcurrentthread_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt index 9da2d075b2..58419a8693 100644 --- a/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentthread_test2 add_dependencies(paltest_getcurrentthread_test2 coreclrpal) target_link_libraries(paltest_getcurrentthread_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt index a0824ab9a2..ecad3d287a 100644 --- a/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getcurrentthreadid_test1 add_dependencies(paltest_getcurrentthreadid_test1 coreclrpal) target_link_libraries(paltest_getcurrentthreadid_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt index 1ef9db2299..184470aee0 100644 --- a/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_getexitcodeprocess_test1 add_dependencies(paltest_getexitcodeprocess_test1 coreclrpal) target_link_libraries(paltest_getexitcodeprocess_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_getexitcodeprocess_test1_child add_dependencies(paltest_getexitcodeprocess_test1_child coreclrpal) target_link_libraries(paltest_getexitcodeprocess_test1_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt index 8e905873e9..b062b349aa 100644 --- a/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getprocesstimes_test2 add_dependencies(paltest_getprocesstimes_test2 coreclrpal) target_link_libraries(paltest_getprocesstimes_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt index aa4dad11ce..23ae7abc58 100644 --- a/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_getthreadtimes_test1 add_dependencies(paltest_getthreadtimes_test1 coreclrpal) target_link_libraries(paltest_getthreadtimes_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt index 315144e1e8..8e3e754631 100644 --- a/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/NamedMutex/test1/CMakeLists.txt @@ -14,7 +14,5 @@ add_executable(paltest_namedmutex_test1 add_dependencies(paltest_namedmutex_test1 coreclrpal) target_link_libraries(paltest_namedmutex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp b/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp index 46a5d87341..ae3ebc361c 100644 --- a/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp +++ b/src/pal/tests/palsuite/threading/NamedMutex/test1/nopal.cpp @@ -16,6 +16,7 @@ #define _countof(a) (sizeof(a) / sizeof(a[0])) +#undef PAGE_SIZE #define PAGE_SIZE (4096) auto test_strcpy = strcpy; diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt index 2d5698b153..e6470c5992 100644 --- a/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openeventw_test1 add_dependencies(paltest_openeventw_test1 coreclrpal) target_link_libraries(paltest_openeventw_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt index bedf83b487..4fd04737cc 100644 --- a/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openeventw_test2 add_dependencies(paltest_openeventw_test2 coreclrpal) target_link_libraries(paltest_openeventw_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt index 7f7622dca0..2ccd175c42 100644 --- a/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_openeventw_test3 add_dependencies(paltest_openeventw_test3 coreclrpal) target_link_libraries(paltest_openeventw_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_openeventw_test3_child add_dependencies(paltest_openeventw_test3_child coreclrpal) target_link_libraries(paltest_openeventw_test3_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt index 73b8904993..dbf3a276b6 100644 --- a/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openeventw_test4 add_dependencies(paltest_openeventw_test4 coreclrpal) target_link_libraries(paltest_openeventw_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt index 3bad4d9cc5..2830182e56 100644 --- a/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_openeventw_test5 add_dependencies(paltest_openeventw_test5 coreclrpal) target_link_libraries(paltest_openeventw_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt index dd2e30516c..df66c3f2d3 100644 --- a/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_openprocess_test1 add_dependencies(paltest_openprocess_test1 coreclrpal) target_link_libraries(paltest_openprocess_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_openprocess_test1_child add_dependencies(paltest_openprocess_test1_child coreclrpal) target_link_libraries(paltest_openprocess_test1_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt index 9a54ad15b6..12a575926a 100644 --- a/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_querythreadcycletime_test1 add_dependencies(paltest_querythreadcycletime_test1 coreclrpal) target_link_libraries(paltest_querythreadcycletime_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt index a99b0a69cc..402188d274 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test1 add_dependencies(paltest_queueuserapc_test1 coreclrpal) target_link_libraries(paltest_queueuserapc_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt index 5d86efdddd..b9f5f01cf5 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test2 add_dependencies(paltest_queueuserapc_test2 coreclrpal) target_link_libraries(paltest_queueuserapc_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt index e07ab67070..8a4c9f26ad 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test3 add_dependencies(paltest_queueuserapc_test3 coreclrpal) target_link_libraries(paltest_queueuserapc_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt index 08a5cc763b..dd97490796 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test4 add_dependencies(paltest_queueuserapc_test4 coreclrpal) target_link_libraries(paltest_queueuserapc_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt index 0ef65ce583..a451712234 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test5 add_dependencies(paltest_queueuserapc_test5 coreclrpal) target_link_libraries(paltest_queueuserapc_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt index 2e7198358c..440b24cf81 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test6 add_dependencies(paltest_queueuserapc_test6 coreclrpal) target_link_libraries(paltest_queueuserapc_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt index c27cd7e67c..6dbeb07e2f 100644 --- a/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_queueuserapc_test7 add_dependencies(paltest_queueuserapc_test7 coreclrpal) target_link_libraries(paltest_queueuserapc_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt index 6bb3a79db4..f8f0d8fb80 100644 --- a/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_releasemutex_test3 add_dependencies(paltest_releasemutex_test3 coreclrpal) target_link_libraries(paltest_releasemutex_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt index 12c83119d8..769c1f3825 100644 --- a/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_resetevent_test1 add_dependencies(paltest_resetevent_test1 coreclrpal) target_link_libraries(paltest_resetevent_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt index 1f67b5d884..69c7b7cc63 100644 --- a/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_resetevent_test2 add_dependencies(paltest_resetevent_test2 coreclrpal) target_link_libraries(paltest_resetevent_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt index fd0d6e8b16..acb31489c4 100644 --- a/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_resetevent_test3 add_dependencies(paltest_resetevent_test3 coreclrpal) target_link_libraries(paltest_resetevent_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt index ca2a918775..d20135a040 100644 --- a/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_resetevent_test4 add_dependencies(paltest_resetevent_test4 coreclrpal) target_link_libraries(paltest_resetevent_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt index 96d7edcbba..0321a28b81 100644 --- a/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_resumethread_test1 add_dependencies(paltest_resumethread_test1 coreclrpal) target_link_libraries(paltest_resumethread_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt index 7c145a8528..ff90b41abe 100644 --- a/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_seterrormode_test1 add_dependencies(paltest_seterrormode_test1 coreclrpal) target_link_libraries(paltest_seterrormode_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt index 8d9d729554..56081c1814 100644 --- a/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setevent_test1 add_dependencies(paltest_setevent_test1 coreclrpal) target_link_libraries(paltest_setevent_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt index 7d33b56058..f94fb486b2 100644 --- a/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setevent_test2 add_dependencies(paltest_setevent_test2 coreclrpal) target_link_libraries(paltest_setevent_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt index 1c66460ea0..c2d48ba483 100644 --- a/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setevent_test3 add_dependencies(paltest_setevent_test3 coreclrpal) target_link_libraries(paltest_setevent_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt index 04f1815259..ae8adecb93 100644 --- a/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_setevent_test4 add_dependencies(paltest_setevent_test4 coreclrpal) target_link_libraries(paltest_setevent_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt index 601789600b..ec9d04f53b 100644 --- a/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sleep_test1 add_dependencies(paltest_sleep_test1 coreclrpal) target_link_libraries(paltest_sleep_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt index b8bc3ed7d7..b24f5e2808 100644 --- a/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sleep_test2 add_dependencies(paltest_sleep_test2 coreclrpal) target_link_libraries(paltest_sleep_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt index b2aed8333b..cf240d7f1a 100644 --- a/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sleepex_test1 add_dependencies(paltest_sleepex_test1 coreclrpal) target_link_libraries(paltest_sleepex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt index 991e9b40e2..6762ec78d7 100644 --- a/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_sleepex_test2 add_dependencies(paltest_sleepex_test2 coreclrpal) target_link_libraries(paltest_sleepex_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt index b9008c486f..18390a6059 100644 --- a/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_switchtothread_test1 add_dependencies(paltest_switchtothread_test1 coreclrpal) target_link_libraries(paltest_switchtothread_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt index fef741272f..85795fa2ea 100644 --- a/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tls_test1 add_dependencies(paltest_tls_test1 coreclrpal) target_link_libraries(paltest_tls_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt index 10c5034589..1dde9e6cb7 100644 --- a/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tls_test2 add_dependencies(paltest_tls_test2 coreclrpal) target_link_libraries(paltest_tls_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt index 6bd76d3fdf..ac814bba93 100644 --- a/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tls_test3 add_dependencies(paltest_tls_test3 coreclrpal) target_link_libraries(paltest_tls_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt index 73ba496f1d..40c1752f61 100644 --- a/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tls_test4 add_dependencies(paltest_tls_test4 coreclrpal) target_link_libraries(paltest_tls_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt index e26fcfff26..c6367f5660 100644 --- a/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tls_test5 add_dependencies(paltest_tls_test5 coreclrpal) target_link_libraries(paltest_tls_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt index bfc7b75e0b..b1ca82c304 100644 --- a/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_tls_test6_optimizedtls add_dependencies(paltest_tls_test6_optimizedtls coreclrpal) target_link_libraries(paltest_tls_test6_optimizedtls - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt index 382e801e29..6cac1488e2 100644 --- a/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_terminateprocess_test1 add_dependencies(paltest_terminateprocess_test1 coreclrpal) target_link_libraries(paltest_terminateprocess_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt index 026f4ed043..7ca88c7001 100644 --- a/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_threadpriority_test1 add_dependencies(paltest_threadpriority_test1 coreclrpal) target_link_libraries(paltest_threadpriority_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt index ea13c7de4c..f7ab138611 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitformultipleobjects_test1 add_dependencies(paltest_waitformultipleobjects_test1 coreclrpal) target_link_libraries(paltest_waitformultipleobjects_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt index 59d4cd8cd4..605c59f7e2 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitformultipleobjectsex_test1 add_dependencies(paltest_waitformultipleobjectsex_test1 coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt index e970ec526e..fb74acc289 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitformultipleobjectsex_test2 add_dependencies(paltest_waitformultipleobjectsex_test2 coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt index f1b76fb819..a00e2fdce4 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitformultipleobjectsex_test3 add_dependencies(paltest_waitformultipleobjectsex_test3 coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt index 815b2b069c..85be0e77ad 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitformultipleobjectsex_test4 add_dependencies(paltest_waitformultipleobjectsex_test4 coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt index 730ec60649..14b8dc1755 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_waitformultipleobjectsex_test5 add_dependencies(paltest_waitformultipleobjectsex_test5 coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test5 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_waitformultipleobjectsex_test5_helper add_dependencies(paltest_waitformultipleobjectsex_test5_helper coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test5_helper - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt index 01331821a8..88254b9eb6 100644 --- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_waitformultipleobjectsex_test6 add_dependencies(paltest_waitformultipleobjectsex_test6 coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_waitformultipleobjectsex_test6_child add_dependencies(paltest_waitformultipleobjectsex_test6_child coreclrpal) target_link_libraries(paltest_waitformultipleobjectsex_test6_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt index 816a98bf2f..1e51e47f60 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_wfsoexmutextest add_dependencies(paltest_waitforsingleobject_wfsoexmutextest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsoexmutextest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt index 2d12b25e69..a36649178c 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_wfsoexsemaphoretest add_dependencies(paltest_waitforsingleobject_wfsoexsemaphoretest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsoexsemaphoretest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt index 915ee94a62..b7940cdee5 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_wfsoexthreadtest add_dependencies(paltest_waitforsingleobject_wfsoexthreadtest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsoexthreadtest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt index b96324d654..0446a9aee2 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_wfsomutextest add_dependencies(paltest_waitforsingleobject_wfsomutextest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsomutextest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt index 61e17eb3ad..b0a250e484 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt @@ -13,9 +13,7 @@ add_executable(paltest_waitforsingleobject_wfsoprocesstest add_dependencies(paltest_waitforsingleobject_wfsoprocesstest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsoprocesstest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) @@ -30,7 +28,5 @@ add_executable(paltest_waitforsingleobject_wfsoprocesstest_child add_dependencies(paltest_waitforsingleobject_wfsoprocesstest_child coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsoprocesstest_child - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt index d17f8da8e5..474edde7fd 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_wfsosemaphoretest add_dependencies(paltest_waitforsingleobject_wfsosemaphoretest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsosemaphoretest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt index e2d36e08e1..5988b6a8f4 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_wfsothreadtest add_dependencies(paltest_waitforsingleobject_wfsothreadtest coreclrpal) target_link_libraries(paltest_waitforsingleobject_wfsothreadtest - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt index 25f3739492..44a9d8fe6a 100644 --- a/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_waitforsingleobject_test1 add_dependencies(paltest_waitforsingleobject_test1 coreclrpal) target_link_libraries(paltest_waitforsingleobject_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt index 1c600bd81c..83a5616144 100644 --- a/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_yieldprocessor_test1 add_dependencies(paltest_yieldprocessor_test1 coreclrpal) target_link_libraries(paltest_yieldprocessor_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt index 4f6947476d..6941fb06b4 100644 --- a/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_releasesemaphore_test1 add_dependencies(paltest_releasesemaphore_test1 coreclrpal) target_link_libraries(paltest_releasesemaphore_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tools/clang-compiler-override-arm.txt b/src/pal/tools/clang-compiler-override-arm.txt new file mode 100644 index 0000000000..da25715ade --- /dev/null +++ b/src/pal/tools/clang-compiler-override-arm.txt @@ -0,0 +1,20 @@ +SET (CMAKE_C_FLAGS_INIT "-Wall -std=c11") +SET (CMAKE_C_FLAGS_DEBUG_INIT "-g -O0") +SET (CLR_C_FLAGS_CHECKED_INIT "-g -O1") +# Refer to the below instruction to support __thread with -O2/-O3 on Linux/ARM +# https://github.com/dotnet/coreclr/blob/master/Documentation/building/linux-instructions.md +SET (CMAKE_C_FLAGS_RELEASE_INIT "-g -O1") +SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-g -O1") + +SET (CMAKE_CXX_FLAGS_INIT "-Wall -Wno-null-conversion -std=c++11") +SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g -O0") +SET (CLR_CXX_FLAGS_CHECKED_INIT "-g -O1") +SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-g -O1") +SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-g -O1") + +SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) +SET (CLR_DEFINES_CHECKED_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) +SET (CLR_DEFINES_RELEASE_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) +SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) + +SET (CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 4054266f0b..db342eb2c9 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -18,18 +18,18 @@ then fi # Set up the environment to be used for building with clang. -if which "clang-$2.$3" > /dev/null 2>&1 +if command -v "clang-$2.$3" > /dev/null then - export CC="$(which clang-$2.$3)" - export CXX="$(which clang++-$2.$3)" -elif which "clang$2$3" > /dev/null 2>&1 + export CC="$(command -v clang-$2.$3)" + export CXX="$(command -v clang++-$2.$3)" +elif command -v "clang$2$3" > /dev/null then - export CC="$(which clang$2$3)" - export CXX="$(which clang++$2$3)" -elif which clang > /dev/null 2>&1 + export CC="$(command -v clang$2$3)" + export CXX="$(command -v clang++$2$3)" +elif command -v clang > /dev/null then - export CC="$(which clang)" - export CXX="$(which clang++)" + export CC="$(command -v clang)" + export CXX="$(command -v clang++)" else echo "Unable to find Clang Compiler" exit 1 @@ -97,12 +97,12 @@ else desired_llvm_version="-$desired_llvm_major_version.$desired_llvm_minor_version" fi locate_llvm_exec() { - if which "$llvm_prefix$1$desired_llvm_version" > /dev/null 2>&1 + if command -v "$llvm_prefix$1$desired_llvm_version" > /dev/null 2>&1 then - echo "$(which $llvm_prefix$1$desired_llvm_version)" - elif which "$llvm_prefix$1" > /dev/null 2>&1 + echo "$(command -v $llvm_prefix$1$desired_llvm_version)" + elif command -v "$llvm_prefix$1" > /dev/null 2>&1 then - echo "$(which $llvm_prefix$1)" + echo "$(command -v $llvm_prefix$1)" else exit 1 fi @@ -128,26 +128,31 @@ if [[ -n "$LLDB_INCLUDE_DIR" ]]; then fi if [[ -n "$CROSSCOMPONENT" ]]; then cmake_extra_defines="$cmake_extra_defines -DCLR_CROSS_COMPONENTS_BUILD=1" -else - if [[ -n "$CROSSCOMPILE" ]]; then - if ! [[ -n "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR not set for crosscompile" - exit 1 - fi - if [[ -z $CONFIG_DIR ]]; then - CONFIG_DIR="$1/cross/$build_arch" - fi - cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake" - cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" +fi +if [[ -n "$CROSSCOMPILE" ]]; then + if ! [[ -n "$ROOTFS_DIR" ]]; then + echo "ROOTFS_DIR not set for crosscompile" + exit 1 + fi + if [[ -z $CONFIG_DIR ]]; then + CONFIG_DIR="$1/cross/$build_arch" fi + cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake" + cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" fi -if [ "$build_arch" == "arm-softfp" ]; then +if [ "$build_arch" == "armel" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" fi +if [ "$build_arch" == "arm" -o "$build_arch" == "armel" ]; then + overridefile=clang-compiler-override-arm.txt +else + overridefile=clang-compiler-override.txt +fi + cmake \ -G "$generator" \ - "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/clang-compiler-override.txt" \ + "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/$overridefile" \ "-DCMAKE_AR=$llvm_ar" \ "-DCMAKE_LINKER=$llvm_link" \ "-DCMAKE_NM=$llvm_nm" \ -- cgit v1.2.3