Skip to content

Commit 3817a55

Browse files
jwillemsenmergify[bot]
authored andcommitted
Rename Updates to Upd to not let windows UAC block this test from starting
* 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
1 parent 84d261f commit 3817a55

5 files changed

Lines changed: 10 additions & 5 deletions

File tree

TAO/orbsvcs/tests/Notify/Basic/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@
77
/MultiTypes
88
/Sequence
99
/Simple
10+
<<<<<<< HEAD
1011
/Updates
12+
=======
13+
/Upd
14+
ExtendedFilter
15+
>>>>>>> 292ef3041e (Rename Updates to Upd to not let windows UAC block this test from starting)

TAO/orbsvcs/tests/Notify/Basic/Basic.mpc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ project(*Notify Extended Filter): notifytest {
6464
}
6565

6666
project(*Notify Updates): notifytest {
67-
exename = Updates
67+
exename = Upd
6868
Source_Files {
6969
Updates.cpp
7070
}

TAO/orbsvcs/tests/Notify/Basic/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Basic Tests
44
===========
55

6-
Updates:
6+
Upd:
77
-------
88
This test will check if the subscription and publication update messages
99
from the event channel are properly received from the Notify Service.
@@ -107,4 +107,4 @@ command line options:
107107
-SupplierBatchSize [count]
108108
-ConsumerBatchSize [count]
109109
-ConsumerDelay [delay]
110-
-InitialDelay [delay]
110+
-InitialDelay [delay]

TAO/orbsvcs/tests/Notify/Basic/run_test.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
name => "Filter",
6868
args => "",
6969
}, {
70-
name => "Updates",
70+
name => "Upd",
7171
args => "",
7272
}, {
7373
name => "Sequence",

TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
name => "Filter",
6868
args => "-ORBConnectIPV6Only 1",
6969
}, {
70-
name => "Updates",
70+
name => "Upd",
7171
args => "-ORBConnectIPV6Only 1",
7272
}, {
7373
name => "Sequence",

0 commit comments

Comments
 (0)