Skip to content

Commit 9d51686

Browse files
ZoltanBojtheZoltanBojthe
committed
tests: module: Followed event banner omnetpp changes and fixed the catastrophic backtracking in regexp
1 parent ceef68d commit 9d51686

1 file changed

Lines changed: 59 additions & 96 deletions

File tree

‎tests/module/IPvXTrafGen_lifecycle.test‎

Lines changed: 59 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -109,102 +109,65 @@ network Test
109109
%#--------------------------------------------------------------------------------------------------------------
110110
%contains-regex: stdout
111111

112-
\*\* Event \#\d+ t=1 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
113-
Sending packet: \(inet::Packet\)appData-0 .*?
114-
.*?
115-
\*\* Event \#\d+ t=1\.4 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
116-
Sending packet: \(inet::Packet\)appData-1 .*?
117-
.*?
118-
?\*\* Event #\d+ t=1\.5 Test\.scenarioManager .*?
119-
Test\.recip starting up
120-
.*?
121-
Test\.recip started
122-
.*?
123-
?\*\* Event \#\d+ t=1\.8 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
124-
Sending packet: \(inet::Packet\)appData-2 .*?
125-
.*?
126-
?\*\* Event #\d+ t=2 Test\.scenarioManager .*?
127-
Test\.sender\[0\] starting up
128-
.*?
129-
Test\.sender\[0\] started
130-
.*?
131-
?\*\* Event \#\d+ t=2 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
132-
Sending packet: \(inet::Packet\)appData-0 .*?
133-
.*?
134-
?\*\* Event \#\d+ t=2\.2 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
135-
Sending packet: \(inet::Packet\)appData-3 .*?
136-
.*?
137-
?\*\* Event \#\d+ t=2\.4 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
138-
Sending packet: \(inet::Packet\)appData-1 .*?
139-
.*?
140-
?\*\* Event \#\d+ t=2\.6 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
141-
Sending packet: \(inet::Packet\)appData-4 .*?
142-
.*?
143-
?\*\* Event \#\d+ t=2\.8 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
144-
Sending packet: \(inet::Packet\)appData-2 .*?
145-
.*?
146-
?\*\* Event #\d+ t=3 Test\.scenarioManager .*?
147-
Test\.recip shutting down
148-
.*?
149-
Test\.recip shut down
150-
.*?
151-
?\*\* Event \#\d+ t=3 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
152-
Sending packet: \(inet::Packet\)appData-5 .*?
153-
.*?
154-
?\*\* Event \#\d+ t=3\.2 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
155-
Sending packet: \(inet::Packet\)appData-3 .*?
156-
.*?
157-
?\*\* Event \#\d+ t=3\.4 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
158-
Sending packet: \(inet::Packet\)appData-6 .*?
159-
.*?
160-
?\*\* Event \#\d+ t=3\.6 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
161-
Sending packet: \(inet::Packet\)appData-4 .*?
162-
.*?
163-
?\*\* Event \#\d+ t=3\.8 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
164-
Sending packet: \(inet::Packet\)appData-7 .*?
165-
.*?
166-
?\*\* Event #\d+ t=4 Test\.scenarioManager .*?
167-
Test\.recip starting up
168-
.*?
169-
Test\.recip started
170-
.*?
171-
?\*\* Event \#\d+ t=4 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
172-
Sending packet: \(inet::Packet\)appData-5 .*?
173-
.*?
174-
?\*\* Event \#\d+ t=4\.2 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
175-
Sending packet: \(inet::Packet\)appData-8 .*?
176-
.*?
177-
?\*\* Event \#\d+ t=4\.4 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
178-
Sending packet: \(inet::Packet\)appData-6 .*?
179-
.*?
180-
?\*\* Event \#\d+ t=4\.6 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
181-
Sending packet: \(inet::Packet\)appData-9 .*?
182-
.*?
183-
?\*\* Event \#\d+ t=4\.8 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
184-
Sending packet: \(inet::Packet\)appData-7 .*?
185-
.*?
186-
?\*\* Event #\d+ t=5 Test\.scenarioManager .*?
187-
Test\.sender\[1\] shutting down
188-
.*?
189-
Test\.sender\[1\] shut down
190-
.*?
191-
?\*\* Event \#\d+ t=5\.2 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
192-
Sending packet: \(inet::Packet\)appData-8 .*?
193-
.*?
194-
?\*\* Event \#\d+ t=5\.6 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
195-
Sending packet: \(inet::Packet\)appData-9 .*?
196-
.*?
197-
?\*\* Event #\d+ t=6 Test\.scenarioManager .*?
198-
Test\.sender\[1\] starting up
199-
.*?
200-
Test\.sender\[1\] started
201-
.*?
202-
?\*\* Event \#\d+ t=6 Test\.sender\[0\]\.trafGen \(IpvxTrafGen,.*?
203-
Sending packet: \(inet::Packet\)appData-10 .*?
204-
.*?
205-
?\*\* Event \#\d+ t=6 Test\.sender\[1\]\.trafGen \(IpvxTrafGen,.*?
206-
Sending packet: \(inet::Packet\)appData-10 .*?
207-
112+
Running simulation\.\.\.
113+
([^\n]*\n)*?\*\* Event #\d+ t=1\.5 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager [^\n]*
114+
([^\n]*\n)*?Test\.recip starting up
115+
([^\n]*\n)*?Test\.recip started
116+
([^\n]*\n)*?\*\* Event \#\d+ t=1\.8 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
117+
Sending packet: \(inet::Packet\)appData-2 [^\n]*
118+
([^\n]*\n)*?\*\* Event #\d+ t=2 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager [^\n]*
119+
([^\n]*\n)*?Test\.sender\[0\] starting up
120+
([^\n]*\n)*?Test\.sender\[0\] started
121+
([^\n]*\n)*?\*\* Event \#\d+ t=2 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
122+
Sending packet: \(inet::Packet\)appData-0 [^\n]*
123+
([^\n]*\n)*?\*\* Event \#\d+ t=2\.2 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
124+
Sending packet: \(inet::Packet\)appData-3 [^\n]*
125+
([^\n]*\n)*?\*\* Event \#\d+ t=2\.4 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
126+
Sending packet: \(inet::Packet\)appData-1 [^\n]*
127+
([^\n]*\n)*?\*\* Event \#\d+ t=2\.6 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
128+
Sending packet: \(inet::Packet\)appData-4 [^\n]*
129+
([^\n]*\n)*?\*\* Event \#\d+ t=2\.8 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
130+
Sending packet: \(inet::Packet\)appData-2 [^\n]*
131+
([^\n]*\n)*?\*\* Event #\d+ t=3 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager [^\n]*
132+
([^\n]*\n)*?Test\.recip shutting down
133+
([^\n]*\n)*?Test\.recip shut down
134+
([^\n]*\n)*?\*\* Event \#\d+ t=3 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
135+
Sending packet: \(inet::Packet\)appData-5 [^\n]*
136+
([^\n]*\n)*?\*\* Event \#\d+ t=3\.2 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
137+
Sending packet: \(inet::Packet\)appData-3 [^\n]*
138+
([^\n]*\n)*?\*\* Event \#\d+ t=3\.4 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
139+
Sending packet: \(inet::Packet\)appData-6 [^\n]*
140+
([^\n]*\n)*?\*\* Event \#\d+ t=3\.6 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
141+
Sending packet: \(inet::Packet\)appData-4 [^\n]*
142+
([^\n]*\n)*?\*\* Event \#\d+ t=3\.8 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
143+
Sending packet: \(inet::Packet\)appData-7 [^\n]*
144+
([^\n]*\n)*?\*\* Event #\d+ t=4 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager [^\n]*
145+
([^\n]*\n)*?Test\.recip starting up
146+
([^\n]*\n)*?Test\.recip started
147+
([^\n]*\n)*?\*\* Event \#\d+ t=4 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
148+
Sending packet: \(inet::Packet\)appData-5 [^\n]*
149+
([^\n]*\n)*?\*\* Event \#\d+ t=4\.2 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
150+
Sending packet: \(inet::Packet\)appData-8 [^\n]*
151+
([^\n]*\n)*?\*\* Event \#\d+ t=4\.4 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
152+
Sending packet: \(inet::Packet\)appData-6 [^\n]*
153+
([^\n]*\n)*?\*\* Event \#\d+ t=4\.6 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
154+
Sending packet: \(inet::Packet\)appData-9 [^\n]*
155+
([^\n]*\n)*?\*\* Event \#\d+ t=4\.8 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
156+
Sending packet: \(inet::Packet\)appData-7 [^\n]*
157+
([^\n]*\n)*?\*\* Event #\d+ t=5 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager [^\n]*
158+
([^\n]*\n)*?Test\.sender\[1\] shutting down
159+
([^\n]*\n)*?Test\.sender\[1\] shut down
160+
([^\n]*\n)*?\*\* Event \#\d+ t=5\.2 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
161+
Sending packet: \(inet::Packet\)appData-8 [^\n]*
162+
([^\n]*\n)*?\*\* Event \#\d+ t=5\.6 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
163+
Sending packet: \(inet::Packet\)appData-9 [^\n]*
164+
([^\n]*\n)*?\*\* Event #\d+ t=6 on scenario-event \(inet::ScenarioTimer\) in Test\.scenarioManager [^\n]*
165+
([^\n]*\n)*?Test\.sender\[1\] starting up
166+
([^\n]*\n)*?Test\.sender\[1\] started
167+
([^\n]*\n)*?\*\* Event \#\d+ t=6 on sendTimer \(cMessage\) in Test\.sender\[0\]\.trafGen \(IpvxTrafGen, id=\d+\)
168+
Sending packet: \(inet::Packet\)appData-10 [^\n]*
169+
([^\n]*\n)*?\*\* Event \#\d+ t=6 on sendTimer \(cMessage\) in Test\.sender\[1\]\.trafGen \(IpvxTrafGen, id=\d+\)
170+
Sending packet: \(inet::Packet\)appData-10 [^\n]*
208171
%#--------------------------------------------------------------------------------------------------------------
209172
%contains: results/General-0.sca
210173
scalar Test.sender[0].trafGen packetSent:count 15

0 commit comments

Comments
 (0)