diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
commit | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch) | |
tree | b48831a898906734f8884d08b6e18f1144ee2b82 /src/pal/tests/palsuite/c_runtime | |
parent | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff) | |
download | coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2 coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip |
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'src/pal/tests/palsuite/c_runtime')
578 files changed, 712 insertions, 2223 deletions
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 Binary files differdeleted file mode 100644 index b20eae054c..0000000000 --- a/src/pal/tests/palsuite/c_runtime/_getw/test1/test.dat +++ /dev/null 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 <palsuite.h> - -/*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 <palsuite.h> - -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/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 <palsuite.h> -#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/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/CMakeLists.txt index cafb9536b0..8fe1cb60ac 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/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/_vsnprintf/_vsnprintf.h b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h index 30e70648c3..7c81136f71 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h @@ -4,7 +4,7 @@ /*============================================================================ ** -** Source: _vsnprintf.h +** Source: _vsnprintf_s.h ** ** Purpose: Contains common testing functions for _vsnprintf ** @@ -21,7 +21,7 @@ int Testvsnprintf(char* buf, size_t count, const char* format, ...) va_list arglist; va_start(arglist, format); - retVal = _vsnprintf(buf, count, format, arglist); + retVal = _vsnprintf_s(buf, count, _TRUNCATE, format, arglist); va_end(arglist); return (retVal); diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt index 489b7bf566..ee97f2bf16 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test1 add_dependencies(paltest_vsnprintf_test1 coreclrpal) target_link_libraries(paltest_vsnprintf_test1 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp index 88aeec27a5..db70f5612b 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/test1.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. @@ -45,11 +45,11 @@ int __cdecl main(int argc, char *argv[]) { Fail("ERROR: expected negative return value, got %d", ret); } - if (memcmp(checkstr, buf, 8) != 0 || buf[8] != 'x') + 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/test1/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat index f96bf084f2..f96bf084f2 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test1/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt index bc35dbd0c2..ad067ccd7d 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test10 add_dependencies(paltest_vsnprintf_test10 coreclrpal) target_link_libraries(paltest_vsnprintf_test10 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp index 3099957ab7..707a91c048 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/test10.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat index a3d8eca54e..a3d8eca54e 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test10/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt index bf3dd9a534..9fb2b903de 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test11 add_dependencies(paltest_vsnprintf_test11 coreclrpal) target_link_libraries(paltest_vsnprintf_test11 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp index 74b0435c6d..4c710e56b0 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/test11.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat index 17e9f04946..17e9f04946 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test11/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt index 9fceeaf7a5..f78711cfdf 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test12 add_dependencies(paltest_vsnprintf_test12 coreclrpal) target_link_libraries(paltest_vsnprintf_test12 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp index 3718620971..528e6582a8 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/test12.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat index 82f58e4371..82f58e4371 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test12/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt index 7e805f6ad4..b37300c6d7 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test13 add_dependencies(paltest_vsnprintf_test13 coreclrpal) target_link_libraries(paltest_vsnprintf_test13 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp index 1abada4033..645a118682 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/test13.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat index d308edf871..d308edf871 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test13/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt index 6e4566b577..97098d48c7 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test14 add_dependencies(paltest_vsnprintf_test14 coreclrpal) target_link_libraries(paltest_vsnprintf_test14 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp index 2e98f6ad4e..05965f0ed7 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/test14.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat index 8d11b1d6ff..8d11b1d6ff 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test14/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt index d9039b39b7..95e5a475f9 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test15 add_dependencies(paltest_vsnprintf_test15 coreclrpal) target_link_libraries(paltest_vsnprintf_test15 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp index 4d32e9c638..cd34f74e6c 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/test15.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat index 913912508e..913912508e 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test15/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt index b298df318b..1fd88667d8 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test16 add_dependencies(paltest_vsnprintf_test16 coreclrpal) target_link_libraries(paltest_vsnprintf_test16 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp index 118ba1453c..de9b74f9b3 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/test16.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat index fc2f13071b..fc2f13071b 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test16/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt index b195f334d3..ffd52caa65 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test17 add_dependencies(paltest_vsnprintf_test17 coreclrpal) target_link_libraries(paltest_vsnprintf_test17 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp index 9b5063ddf0..3304eda7f9 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/test17.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat index aeb924495c..aeb924495c 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test17/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt index f0f6d1124e..1bd8e3bc5a 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test18 add_dependencies(paltest_vsnprintf_test18 coreclrpal) target_link_libraries(paltest_vsnprintf_test18 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp index 5232befc7f..14ad8f583a 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/test18.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat index 57aaed5953..57aaed5953 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test18/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt index 44b38902ef..3848c130b0 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test19 add_dependencies(paltest_vsnprintf_test19 coreclrpal) target_link_libraries(paltest_vsnprintf_test19 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp index 211354bc3a..6f2aefa94c 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/test19.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat index cda8966865..cda8966865 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test19/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt index 1d3910e70c..5bdf0acff3 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test2 add_dependencies(paltest_vsnprintf_test2 coreclrpal) target_link_libraries(paltest_vsnprintf_test2 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp index 4bac4d2c83..e5808f363e 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/test2.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. */ @@ -37,6 +37,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/_vsnprintf/test2/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat index 6e8f03e639..6e8f03e639 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test2/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt index 62d765ec5f..7268cf17f7 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test3 add_dependencies(paltest_vsnprintf_test3 coreclrpal) target_link_libraries(paltest_vsnprintf_test3 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp index 2b30c9ad99..bb8b153b52 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/test3.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. @@ -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/_vsnprintf/test3/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat index 638cef69ef..638cef69ef 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test3/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt index 5662bd57ad..f2419479fd 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test4 add_dependencies(paltest_vsnprintf_test4 coreclrpal) target_link_libraries(paltest_vsnprintf_test4 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp index 33fc49deba..c4a77f957d 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. @@ -58,7 +58,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/_vsnprintf/test4/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat index 03ff2931bc..03ff2931bc 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt index d80d433c22..3c6b43fe20 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test6 add_dependencies(paltest_vsnprintf_test6 coreclrpal) target_link_libraries(paltest_vsnprintf_test6 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp index 103d1181c2..cbcead88b5 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/test6.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat index e375f9238d..e375f9238d 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test6/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt index a1dc0a7c2c..6708b39001 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test7 add_dependencies(paltest_vsnprintf_test7 coreclrpal) target_link_libraries(paltest_vsnprintf_test7 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp index c7e45d67fa..4843d27598 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/test7.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. */ diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat index 09eb481b59..09eb481b59 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test7/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt index 1ca4732492..8a396fdcf2 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test8 add_dependencies(paltest_vsnprintf_test8 coreclrpal) target_link_libraries(paltest_vsnprintf_test8 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp index 2cefbeac25..8021a797c8 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/test8.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat index 1bdf411983..1bdf411983 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test8/testinfo.dat diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt index 583971fe5a..136856b649 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/CMakeLists.txt @@ -13,7 +13,5 @@ add_executable(paltest_vsnprintf_test9 add_dependencies(paltest_vsnprintf_test9 coreclrpal) target_link_libraries(paltest_vsnprintf_test9 - pthread - m - coreclrpal + ${COMMON_TEST_LIBRARIES} ) diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp index d2cd8165c0..d36846e401 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/test9.cpp @@ -12,7 +12,7 @@ **===================================================================*/ #include <palsuite.h> -#include "../_vsnprintf.h" +#include "../_vsnprintf_s.h" /* * Notes: memcmp is used, as is strlen. diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat index bdaae87ce8..bdaae87ce8 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/testinfo.dat +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test9/testinfo.dat 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 <palsuite.h> -#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 <palsuite.h> -#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 <palsuite.h> -#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; |