Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Dec 17, 2025

…he UAC installer protection, see https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-vista/cc709628(v=ws.10)?redirectedfrom=MSDN

* ACE/tests/Reactor_Dispatch_Order_Test.cpp -> ACE/tests/Reactor_Disp_Order_Test.cpp:
* ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp -> ACE/tests/Reactor_Disp_Order_Test_Dev_Poll.cpp: Moved.

* ACE/tests/run_test.lst:
* ACE/tests/tests.mpc:

Summary by CodeRabbit

  • Chores

    • Standardized and shortened test names for Reactor Dispatch Order tests across test metadata, test runner entries, and build configurations.
    • Simplified DEV_POLL variant handling by removing the alternate fallback path.
  • Chores / Tests

    • Renamed Notify "Updates" test to "Upd" across test lists and ignore rules.
  • Documentation

    • Shortened a README section header and adjusted a command-line option formatting.

✏️ Tip: You can customize this high-level summary in your review settings.


This is an automatic backport of pull request #2494 done by [Mergify](https://mergify.com).

…he UAC installer protection, see https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-vista/cc709628(v=ws.10)?redirectedfrom=MSDN

    * ACE/tests/Reactor_Dispatch_Order_Test.cpp -> ACE/tests/Reactor_Disp_Order_Test.cpp:
    * ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp -> ACE/tests/Reactor_Disp_Order_Test_Dev_Poll.cpp:
      Moved.

    * ACE/tests/run_test.lst:
    * ACE/tests/tests.mpc:

(cherry picked from commit 7f80b0b)
    * ACE/tests/Reactor_Disp_Order_Test_Dev_Poll.cpp:

(cherry picked from commit ede6ba6)
    * ACE/tests/.gitignore:

(cherry picked from commit d828d25)
    * ACE/tests/Reactor_Disp_Order_Test_Dev_Poll.cpp:

(cherry picked from commit 0d601ed)
…rting

    * TAO/orbsvcs/tests/Notify/Basic/.gitignore:
    * TAO/orbsvcs/tests/Notify/Basic/Basic.mpc:
    * TAO/orbsvcs/tests/Notify/Basic/README:
    * TAO/orbsvcs/tests/Notify/Basic/run_test.pl:
    * TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:

(cherry picked from commit 292ef30)

# Conflicts:
#	TAO/orbsvcs/tests/Notify/Basic/.gitignore
@mergify mergify bot added the conflicts label Dec 17, 2025
@mergify
Copy link
Author

mergify bot commented Dec 17, 2025

Cherry-pick of 292ef30 has failed:

On branch mergify/bp/ace6tao2/pr-2494
Your branch is ahead of 'origin/ace6tao2' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 292ef3041e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
	modified:   TAO/orbsvcs/tests/Notify/Basic/README
	modified:   TAO/orbsvcs/tests/Notify/Basic/run_test.pl
	modified:   TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   TAO/orbsvcs/tests/Notify/Basic/.gitignore

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 17, 2025

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Comment @coderabbitai help to get the list of available commands and usage tips.

Removed 'Updates' entry and renamed it to 'Upd' to avoid Windows UAC issues.
@jwillemsen jwillemsen merged commit 6e037b3 into ace6tao2 Dec 17, 2025
45 of 55 checks passed
@jwillemsen jwillemsen deleted the mergify/bp/ace6tao2/pr-2494 branch December 17, 2025 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants