Bug 1319595, part 2 - Add async annotations to IPDL unit tests. r=billm
As of
bug 1240871 these are no longer optional.
MozReview-Commit-ID: 2r2uxJP9dDr
--- a/ipc/ipdl/test/ipdl/error/array_Recursive.ipdl
+++ b/ipc/ipdl/test/ipdl/error/array_Recursive.ipdl
@@ -1,3 +1,3 @@
protocol array_Recursive {
-child: Msg(int[][] aa);
+child: async Msg(int[][] aa);
};
--- a/ipc/ipdl/test/ipdl/error/conflictProtocolMsg.ipdl
+++ b/ipc/ipdl/test/ipdl/error/conflictProtocolMsg.ipdl
@@ -1,7 +1,7 @@
protocol conflictProtocolMsg {
// it's an error to re-use the protocol name as a message ID; these
// are reserved
-child: conflictProtocolMsg();
+child: async conflictProtocolMsg();
};
--- a/ipc/ipdl/test/ipdl/error/cyclecheck_Child.ipdl
+++ b/ipc/ipdl/test/ipdl/error/cyclecheck_Child.ipdl
@@ -1,12 +1,12 @@
include protocol cyclecheck_Parent;
include protocol cyclecheck_Grandchild;
protocol cyclecheck_Child {
manager cyclecheck_Parent;
manages cyclecheck_Grandchild;
child:
- cyclecheck_Grandchild();
+ async cyclecheck_Grandchild();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/cyclecheck_Grandchild.ipdl
+++ b/ipc/ipdl/test/ipdl/error/cyclecheck_Grandchild.ipdl
@@ -1,12 +1,12 @@
include protocol cyclecheck_Child;
include protocol cyclecheck_Parent;
protocol cyclecheck_Grandchild {
manager cyclecheck_Child;
manages cyclecheck_Parent;
child:
- cyclecheck_Parent();
+ async cyclecheck_Parent();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/cyclecheck_Parent.ipdl
+++ b/ipc/ipdl/test/ipdl/error/cyclecheck_Parent.ipdl
@@ -1,10 +1,10 @@
include protocol cyclecheck_Child;
protocol cyclecheck_Parent {
manages cyclecheck_Child;
child:
- cyclecheck_Child();
+ async cyclecheck_Child();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/manageSelfToplevel.ipdl
+++ b/ipc/ipdl/test/ipdl/error/manageSelfToplevel.ipdl
@@ -1,8 +1,8 @@
protocol manageSelfToplevel {
manager manageSelfToplevel;
manages manageSelfToplevel;
child:
- manageSelfToplevel();
+ async manageSelfToplevel();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/managedNoCtor.ipdl
+++ b/ipc/ipdl/test/ipdl/error/managedNoCtor.ipdl
@@ -1,7 +1,7 @@
include protocol managerNoCtor;
protocol managedNoCtor {
manager managerNoCtor;
// empty
-child: __delete__();
+child: async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/managerNoDtor.ipdl
+++ b/ipc/ipdl/test/ipdl/error/managerNoDtor.ipdl
@@ -1,9 +1,9 @@
include protocol managedNoDtor;
protocol managerNoDtor {
manages managedNoDtor;
parent:
- managedNoDtor();
+ async managedNoDtor();
// error: no ctor defined
};
--- a/ipc/ipdl/test/ipdl/error/multimanDupMgrsMgr.ipdl
+++ b/ipc/ipdl/test/ipdl/error/multimanDupMgrsMgr.ipdl
@@ -1,9 +1,9 @@
include protocol multimanDupMgrs;
protocol multimanDupMgrsMgr {
manages multimanDupMgrs;
child:
- multimanDupMgrs();
+ async multimanDupMgrs();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/noProtocolInHeader.ipdlh
+++ b/ipc/ipdl/test/ipdl/error/noProtocolInHeader.ipdlh
@@ -1,4 +1,4 @@
protocol noProtocolInHeader {
child:
- __delete__();
+ async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/redeclParamReturn.ipdl
+++ b/ipc/ipdl/test/ipdl/error/redeclParamReturn.ipdl
@@ -1,7 +1,7 @@
sync protocol redeclParamReturn {
// it's an error to name a parameter with the same id as a return
-parent: Msg(int f) returns (bool f);
+parent: async Msg(int f) returns (bool f);
};
--- a/ipc/ipdl/test/ipdl/error/shmem.ipdl
+++ b/ipc/ipdl/test/ipdl/error/shmem.ipdl
@@ -1,5 +1,5 @@
using class mozilla::ipc::Shmem from "mozilla/ipc/Shmem.h"; // redeclaration
protocol shmem {
-child: Msg(Shmem s);
+child: async Msg(Shmem s);
};
--- a/ipc/ipdl/test/ipdl/error/structRedecl.ipdl
+++ b/ipc/ipdl/test/ipdl/error/structRedecl.ipdl
@@ -1,8 +1,8 @@
struct Redecl {
int a;
double a;
};
protocol structRedecl {
-child: __delete__();
+child: async __delete__();
};
--- a/ipc/ipdl/test/ipdl/error/structUnknownField.ipdl
+++ b/ipc/ipdl/test/ipdl/error/structUnknownField.ipdl
@@ -1,7 +1,7 @@
struct S {
Foobers i;
};
protocol structUnknownField {
-child: __delete__(S s);
+child: async __delete__(S s);
};
--- a/ipc/ipdl/test/ipdl/error/twoprotocols.ipdl
+++ b/ipc/ipdl/test/ipdl/error/twoprotocols.ipdl
@@ -1,9 +1,9 @@
// it's an error to define two protocols in the same file
protocol p1 {
-child: Msg();
+child: async Msg();
};
protocol p2 {
-child: Msg();
+child: async Msg();
};
--- a/ipc/ipdl/test/ipdl/error/undeclParamType.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undeclParamType.ipdl
@@ -1,5 +1,5 @@
protocol undeclParamType {
-child: Msg(FARGLEGARGLE p);
+child: async Msg(FARGLEGARGLE p);
};
--- a/ipc/ipdl/test/ipdl/error/undeclProtocol.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undeclProtocol.ipdl
@@ -1,6 +1,6 @@
protocol undeclProtocol {
manages undeclared;
child:
- undeclared();
+ async undeclared();
};
--- a/ipc/ipdl/test/ipdl/error/undefMutualRecStruct.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undefMutualRecStruct.ipdl
@@ -1,7 +1,7 @@
struct X { Y y; };
struct Y { Z z; };
struct Z { X x; };
protocol undefMutualRecStruct {
-child: __delete__(X x);
+child: async __delete__(X x);
};
--- a/ipc/ipdl/test/ipdl/error/undefMutualRecStructUnion.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undefMutualRecStructUnion.ipdl
@@ -1,7 +1,7 @@
struct X { Y y; };
union Y { Z; };
struct Z { X x; };
protocol undefMutualRecStructUnion {
-child: __delete__(X x);
+child: async __delete__(X x);
};
--- a/ipc/ipdl/test/ipdl/error/undefMutualRecUnion.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undefMutualRecUnion.ipdl
@@ -1,7 +1,7 @@
union X { Y; };
union Y { Z; };
union Z { X; };
protocol undefMutualRecUnion {
-child: __delete__(X x);
+child: async __delete__(X x);
};
--- a/ipc/ipdl/test/ipdl/error/undefSelfRecStruct.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undefSelfRecStruct.ipdl
@@ -1,5 +1,5 @@
struct X { X x; };
protocol undefSelfRecStruct {
-child: __delete__(X x);
+child: async __delete__(X x);
};
--- a/ipc/ipdl/test/ipdl/error/undefSelfRecUnion.ipdl
+++ b/ipc/ipdl/test/ipdl/error/undefSelfRecUnion.ipdl
@@ -1,5 +1,5 @@
union X { X; };
protocol undefSelfRecUnion {
-child: __delete__(X x);
+child: async __delete__(X x);
};
--- a/ipc/ipdl/test/ipdl/ok/actorparam.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/actorparam.ipdl
@@ -1,5 +1,5 @@
protocol actorparam {
-child: Msg(actorparam p);
+child: async Msg(actorparam p);
};
--- a/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl
@@ -1,10 +1,10 @@
include protocol array_OfActorsSub;
protocol array_OfActors {
manages array_OfActorsSub;
child:
async Msg(array_OfActorsSub[] p);
- array_OfActorsSub();
+ async array_OfActorsSub();
};
--- a/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl
@@ -1,7 +1,7 @@
include protocol array_OfActors;
protocol array_OfActorsSub {
manager array_OfActors;
-child: __delete__();
+child: async __delete__();
};
--- a/ipc/ipdl/test/ipdl/ok/builtins.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/builtins.ipdl
@@ -1,13 +1,13 @@
protocol builtins {
// sanity-check that "essential" builtins are being declared
-child: Msg(bool b,
+child: async Msg(bool b,
char c,
int i,
long l,
float f,
double d,
int8_t i8t,
--- a/ipc/ipdl/test/ipdl/ok/empty.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/empty.ipdl
@@ -1,3 +1,3 @@
protocol empty {
-child: Msg();
+child: async Msg();
};
--- a/ipc/ipdl/test/ipdl/ok/emptyStruct.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/emptyStruct.ipdl
@@ -1,3 +1,3 @@
struct empty { };
-protocol emptyStruct { child: __delete__(); };
+protocol emptyStruct { child: async __delete__(); };
--- a/ipc/ipdl/test/ipdl/ok/manageSelf.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/manageSelf.ipdl
@@ -1,10 +1,10 @@
include protocol manageSelf_Toplevel;
protocol manageSelf {
manager manageSelf_Toplevel or manageSelf;
manages manageSelf;
child:
- manageSelf();
+ async manageSelf();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/ok/manageSelf_Toplevel.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/manageSelf_Toplevel.ipdl
@@ -1,9 +1,9 @@
include protocol manageSelf;
protocol manageSelf_Toplevel {
manages manageSelf;
child:
- manageSelf();
+ async manageSelf();
async __delete__();
};
--- a/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl
@@ -1,13 +1,13 @@
include protocol managedProtocol;
// sanity check of managed/manager protocols
protocol managerProtocol {
manages managedProtocol;
parent:
- managedProtocol(int i);
+ async managedProtocol(int i);
state CREATING:
recv managedProtocol goto CREATING;
};
--- a/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl
@@ -1,8 +1,8 @@
include protocol multiManaged;
protocol multiManager1 {
manages multiManaged;
child:
- multiManaged();
+ async multiManaged();
};
--- a/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl
@@ -1,8 +1,8 @@
include protocol multiManaged;
protocol multiManager2 {
manages multiManaged;
child:
- multiManaged();
+ async multiManaged();
};
--- a/ipc/ipdl/test/ipdl/ok/multiOutStates.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiOutStates.ipdl
@@ -1,10 +1,10 @@
protocol multiOutStates {
-child: Msg();
+child: async Msg();
// sanity check that multi-out-states are being processed correctly
state S1:
send Msg goto S2 or S3 or S4;
state S2: send Msg goto S2;
state S3: send Msg goto S3;
--- a/ipc/ipdl/test/ipdl/ok/multiStartState.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiStartState.ipdl
@@ -1,11 +1,11 @@
protocol multiStartState {
-child: Msg(); __delete__();
+child: async Msg(); async __delete__();
start state S1:
send Msg goto S1; send __delete__;
start state S2:
send Msg goto S2; send __delete__;
};