Skip to content

Fix PAL tests#116197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 2 commits into from
Jun 4, 2025
Merged

Fix PAL tests #116197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad873d4
Fix PAL tests
jkotas Jun 1, 2025
e3d68a8
More
jkotas Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/pal/tests/palsuite/common/palsuite.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,8 +184,8 @@ mkAbsoluteFilenameA (
sizeFN = strlen( fileName );
sizeAPN = (sizeDN + 1 + sizeFN + 1);

/* ensure ((dirName + DELIM + fileName + \0) =< _MAX_PATH ) */
if ( sizeAPN > _MAX_PATH )
/* ensure ((dirName + DELIM + fileName + \0) =< MAX_PATH ) */
if ( sizeAPN > MAX_PATH )
{
return ( 0 );
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ PALTEST(threading_Sleep_test1_paltest_sleep_test1, "threading/Sleep/test1/paltes
Sleep(SleepTimes[i]);
NewTimeStamp = minipal_hires_ticks();

TimeDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
TimeDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

/* For longer intervals use a 10 percent tolerance */
if ((SleepTimes[i] * 0.1) > AcceptableTimeError)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,7 @@ PALTEST(threading_Sleep_test2_paltest_sleep_test2, "threading/Sleep/test2/paltes
Sleep(SleepTimes[i]);
NewTimeStamp = minipal_hires_ticks();

TimeDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
TimeDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

MaxDelta = SleepTimes[i] + AcceptableTimeError;

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,7 @@ PALTEST(threading_SleepEx_test1_paltest_sleepex_test1, "threading/SleepEx/test1/

NewTimeStamp = minipal_hires_ticks();

TimeDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
TimeDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

/* For longer intervals use a 10 percent tolerance */
if ((testCases[i].SleepTime * 0.1) > AcceptableTimeError)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ DWORD PALAPI SleeperProc_SleepEx_test2(LPVOID lpParameter)
}


ThreadSleepDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
ThreadSleepDelta = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

return 0;
}
2 changes: 1 addition & 1 deletion src/coreclr/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,7 +176,7 @@ DWORD PALAPI WaiterProc_WFMO_test2(LPVOID lpParameter)
"Expected return of WAIT_TIMEOUT, got %d.\n", ret);
}

ThreadWaitDelta_WFMO_test2 = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
ThreadWaitDelta_WFMO_test2 = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

@jkotasjkotasJun 1, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing mistake in my regex.


ret = CloseHandle(Semaphore);
if (!ret)
Expand Down
2 changes: 1 addition & 1 deletion ...eclr/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,7 +204,7 @@ DWORD PALAPI WaiterProc_WFSOExMutexTest(LPVOID lpParameter)
"Expected return of WAIT_TIMEOUT, got %d.\n", ret);
}

ThreadWaitDelta_WFSOExMutexTest = NewTimeStamp - OldTimeStamp;
ThreadWaitDelta_WFSOExMutexTest = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

@jkotasjkotasJun 1, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AaronRobinsonMSFT This was accidentally deleted in #115858

@jkotasjkotasJun 1, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before this fix, it is failing with:

Thread waited for 2138803459 ms! (Acceptable delta: 300)
FAILED: threading/WaitForSingleObject/WFSOExMutexTest/paltest_waitforsingleobject_wfsoexmutextest. Exit code: 1


return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion .../tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -171,7 +171,7 @@ DWORD PALAPI WaiterProc_WFSOExSemaphoreTest(LPVOID lpParameter)
}


ThreadWaitDelta_WFSOExSemaphoreTest = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
ThreadWaitDelta_WFSOExSemaphoreTest = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

ret = CloseHandle(hSemaphore);
if (!ret)
Expand Down
2 changes: 1 addition & 1 deletion ...lr/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ satisfying any threads that were waiting on the object.
"Expected return of WAIT_TIMEOUT, got %d.\n", ret);
}

ThreadWaitDelta_WFSOExThreadTest = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);;
ThreadWaitDelta_WFSOExThreadTest = (NewTimeStamp - OldTimeStamp) / (minipal_hires_tick_frequency() / 1000);

ret = CloseHandle(hWaitThread);
if (!ret)
Expand Down