diff options
Diffstat (limited to 'src/pal/tests')
25 files changed, 30 insertions, 109 deletions
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/_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/_vsnprintf_s/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp index 0cf25cb88d..c4a77f957d 100644 --- a/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/test4/test4.cpp @@ -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/_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/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/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/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/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/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/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/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/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/vswprintf/test4/test4.cpp b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp index 583cf0c849..c54fe6aabb 100644 --- a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp +++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp @@ -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/common/ResultTime.h b/src/pal/tests/palsuite/common/ResultTime.h index df706e7a64..82daeb83c4 100644 --- a/src/pal/tests/palsuite/common/ResultTime.h +++ b/src/pal/tests/palsuite/common/ResultTime.h @@ -11,11 +11,7 @@ const char *szDotNetInstallEnvVar = "DOTNET_INSTALL"; const char *szQASupportDirEnvVar = "QA_SUPPORT_DIR"; -#ifdef PLATFORM_UNIX #define SEPERATOR "/" -#else -#define SEPERATOR "\\" -#endif char *getBuildNumber() { char *szBuildFileName = "buildinfo.txt"; @@ -34,16 +30,6 @@ char *getBuildNumber() Fail("ERROR: Couldn't allocate enough memory to potentially store build number\n"); } -#ifndef PLATFORM_UNIX - pDirectoryName = getenv(szDotNetInstallEnvVar); - if (pDirectoryName == NULL) - { - /* This condition may exist if the test is being run in say the Dev environment.*/ - Trace("WARNING: Coriolis Test Environment may not be setup correctly. Variable DOTNET_INSTALL not set\n"); - _snprintf(szTempValue, 99, "0000.00"); - return szTempValue; - } -#else pDirectoryName = getenv(szQASupportDirEnvVar); if (pDirectoryName == NULL) { @@ -52,14 +38,8 @@ char *getBuildNumber() return szTempValue; } -#endif //PLATFORM_UNIX - -#ifndef PLATFORM_UNIX - _snprintf(szBuildFileLoc, MAX_PATH, "%s%s%s", pDirectoryName, SEPERATOR, szBuildFileName); -#else // To avoid buffer overruns for pDirectoryName _snprintf(szBuildFileLoc, MAX_PATH, "%s/../1.0%s%s", pDirectoryName, SEPERATOR, szBuildFileName); -#endif //PLATFORM_UNIX fp = fopen( szBuildFileLoc, "r"); if( fp == NULL) { diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp index deb8252b70..d3cfa762bb 100644 --- a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp +++ b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp @@ -129,8 +129,6 @@ make the most sense to just skip the named semaphore test on Windows - from an object management perspective it doesn't really gain us anything over what we already have." */ -#ifdef PLATFORM_UNIX - ZeroMemory( objectSuffix, MAX_PATH ); if(GetParameters(argc, argv)) @@ -272,7 +270,6 @@ us anything over what we already have." Trace("Test Failed\n"); } -#endif //PLATFORM_UNIX PAL_Terminate(); return testReturnCode; } diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp index 6c2d80b3f4..d45dc92f04 100644 --- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp @@ -460,7 +460,7 @@ int test11(int num, ...) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) Trace("Testing for 64 Bit Platforms \n"); if(memcmp(OutBuffer, convert("Pal 00000000000123AB and foo Testing"), diff --git a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp index ca9e5bb5bf..a68a1f609e 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterLockedExchangeAdd/test1/test.cpp @@ -36,7 +36,7 @@ int __cdecl main(int argc, char *argv[]) -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) ptrValue = (LONG *) malloc(sizeof(LONG)); if(ptrValue == NULL) diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp index 56430e60cf..bb5981c65b 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test1/test.cpp @@ -42,7 +42,7 @@ int __cdecl main(int argc, char *argv[]) { /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) /* Compare START_VALUE with BaseVariableToManipulate, they're equal, so exchange */ @@ -55,18 +55,10 @@ int __cdecl main(int argc, char *argv[]) { /* Exchanged, these should be equal now */ if(BaseVariableToManipulate != ValueToExchange) { -#ifdef PLATFORM_UNIX Fail("ERROR: A successful compare and exchange should have occurred, " "making the variable have the value of %ll, as opposed to the " "current value of %ll.", ValueToExchange,BaseVariableToManipulate); -#else - Fail("ERROR: A successful compare and exchange should have occurred, " - "making the variable have the value of %I64, as opposed to the " - "current value of %d.", - ValueToExchange,BaseVariableToManipulate); - -#endif } /* Check to make sure it returns the original number which @@ -74,15 +66,9 @@ int __cdecl main(int argc, char *argv[]) { */ if(TheReturn != START_VALUE) { -#ifdef PLATFORM_UNIX Fail("ERROR: The return value after the first exchange should be the " "former value of the variable, which was %ll, but it is now %ll.", START_VALUE,TheReturn); -#else - Fail("ERROR: The return value after the first exchange should be the " - "former value of the variable, which was %I64, but it is now %I64.", - START_VALUE,TheReturn); -#endif } @@ -103,20 +89,13 @@ int __cdecl main(int argc, char *argv[]) { if(BaseVariableToManipulate != TempValue) { -#ifdef PLATFORM_UNIX Fail("ERROR: An attempted exchange should have failed due to " "the compare failing. But, it seems to have succeeded. The " "value should be %ll but is %ll in this case.", TempValue,BaseVariableToManipulate); -#else - Fail("ERROR: An attempted exchange should have failed due to " - "the compare failing. But, it seems to have succeeded. The " - "value should be %I64 but is %I64 in this case.", - TempValue,BaseVariableToManipulate); -#endif } -#endif //if defined(BIT64) && defined(PLATFORM_UNIX) +#endif //if defined(BIT64) PAL_Terminate(); return PASS; } diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp index 2440543631..b2b0b6337c 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedCompareExchange64/test2/test.cpp @@ -47,7 +47,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ - #if defined(BIT64) && defined(PLATFORM_UNIX) + #if defined(BIT64) //Create MAX_THREADS threads that will operate on the global counter for (i=0;i<MAX_THREADS;i++) @@ -84,7 +84,7 @@ int __cdecl main(int argc, char *argv[]) Fail("Test Case Failed: InterlockedDecrement \n"); } - #endif //defined(BIT64) && defined(PLATFORM_UNIX) + #endif //defined(BIT64) PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp index 326587d9a1..ccdb976256 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test1/test.cpp @@ -36,7 +36,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) /* Compare START_VALUE with BaseVariableToManipulate, they're equal, so exchange */ @@ -46,27 +46,17 @@ int __cdecl main(int argc, char *argv[]) /* Decremented twice, it should be -2 now */ if(TheValue != -2) { -#ifdef PLATFORM_UNIX Fail("ERROR: After being decremented twice, the value should be -2, " "but it is really %ll.",TheValue); -#else - Fail("ERROR: After being decremented twice, the value should be -2, " - "but it is really %I64.",TheValue); -#endif } /* Check to make sure it returns itself */ if(TheReturn != TheValue) { -#ifdef PLATFORM_UNIX Fail("ERROR: The function should have returned the new value of %d " "but instead returned %ll.",TheValue,TheReturn); -#else - Fail("ERROR: After being decremented twice, the value should be -2, " - "but it is really %I64.",TheValue); -#endif } -#endif //defined(BIT64) && defined(PLATFORM_UNIX) +#endif //defined(BIT64) PAL_Terminate(); return PASS; } diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp index fa748d538d..98560a6680 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedDecrement64/test2/test.cpp @@ -40,7 +40,7 @@ int __cdecl main(int argc, char *argv[]) return FAIL; } - #if defined(BIT64) && defined(PLATFORM_UNIX) + #if defined(BIT64) //Create MAX_THREADS threads that will operate on the global counter for (i=0;i<MAX_THREADS;i++) @@ -79,7 +79,7 @@ int __cdecl main(int argc, char *argv[]) Fail("Test Case Failed: InterlockedDecrement \n"); } -#endif //defined(BIT64) && defined(PLATFORM_UNIX) +#endif //defined(BIT64) PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp index bd26a547cc..3dd1cddd91 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedExchange64/test1/test.cpp @@ -39,7 +39,7 @@ int __cdecl main(int argc, char *argv[]) { /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) TheReturn = InterlockedExchange64(&TheValue,NewValue); @@ -48,13 +48,8 @@ int __cdecl main(int argc, char *argv[]) { */ if(TheValue != NewValue) { -#ifdef PLATFORM_UNIX Fail("ERROR: The value which was exchanged should now be %ll, but " "instead it is %ll.",NewValue,TheValue); -#else - Fail("ERROR: The value which was exchanged should now be %I64, but " - "instead it is %I64.",NewValue,TheValue); -#endif } /* Check to make sure it returns the origional number which 'TheValue' was @@ -63,18 +58,12 @@ int __cdecl main(int argc, char *argv[]) { if(TheReturn != START_VALUE) { -#ifdef PLATFORM_UNIX Fail("ERROR: The value returned should be the value before the " "exchange happened, which was %ll, but %ll was returned.", START_VALUE,TheReturn); -#else - Fail("ERROR: The value returned should be the value before the " - "exchange happened, which was %I64, but %I64 was returned.", - START_VALUE,TheReturn); -#endif } -#endif // BIT64 && PLATFORM_UNIX +#endif // BIT64 PAL_Terminate(); return PASS; } diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp index c02886f5c6..7d10e5c624 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test1/test.cpp @@ -37,7 +37,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ -#if defined(BIT64) && defined(PLATFORM_UNIX) +#if defined(BIT64) InterlockedIncrement64(&TheValue); TheReturn = InterlockedIncrement64(&TheValue); @@ -45,28 +45,18 @@ int __cdecl main(int argc, char *argv[]) /* Incremented twice, it should be 2 now */ if(TheValue != 2) { -#ifdef PLATFORM_UNIX Fail("ERROR: The value was incremented twice and shoud now be 2, " "but it is really %ll",TheValue); -#else - Fail("ERROR: The value was incremented twice and shoud now be 2, " - "but it is really %I64",TheValue); -#endif } /* Check to make sure it returns itself */ if(TheReturn != TheValue) { -#ifdef PLATFORM_UNIX Fail("ERROR: The function should return the new value, which shoud " "have been %d, but it returned %ll.",TheValue,TheReturn); -#else - Fail("ERROR: The function should return the new value, which shoud " - "have been %d, but it returned %I64.",TheValue,TheReturn); -#endif } -#endif //defined(BIT64) && defined(PLATFORM_UNIX) +#endif //defined(BIT64) PAL_Terminate(); return PASS; } diff --git a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp index 1d579fe325..ffddc9d418 100644 --- a/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp +++ b/src/pal/tests/palsuite/miscellaneous/InterlockedIncrement64/test2/test.cpp @@ -43,7 +43,7 @@ int __cdecl main(int argc, char *argv[]) /* ** Run only on 64 bit platforms */ - #if defined(BIT64) && defined(PLATFORM_UNIX) + #if defined(BIT64) //Create MAX_THREADS threads that will operate on the global counter for (i=0;i<MAX_THREADS;i++) @@ -81,7 +81,7 @@ int __cdecl main(int argc, char *argv[]) { Fail("Test Case Failed: InterlockedDecrement \n"); } - #endif //defined(BIT64) && defined(PLATFORM_UNIX) + #endif //defined(BIT64) PAL_Terminate(); return PASS; diff --git a/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp b/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp index dda25f1f4b..4084e1f9cf 100644 --- a/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp +++ b/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp @@ -15,11 +15,7 @@ #include <palsuite.h> -#ifndef PLATFORM_UNIX -#define LLFORMAT "%I64u" -#else #define LLFORMAT "%llu" -#endif ULONGLONG dwCreateThreadTestParameter = 0; |