Skip to content

Commit 83d55d5

Browse files
ZoltanBojtheZoltanBojthe
committed
tests: module: updated number format for omnetpp 6.4
1 parent 9f98e5a commit 83d55d5

6 files changed

Lines changed: 42 additions & 42 deletions

‎tests/module/tcp_algorithm_dumb.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ description = "inet_TCP <---> inet_TCP with algorithms"
6565
%#################################################################################################################
6666

6767
%contains: results/General-0.sca
68-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
68+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
6969

7070
%contains: results/General-1.sca
71-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
71+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7272

7373
%contains: results/General-2.sca
74-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
74+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7575

7676
%contains: results/General-3.sca
77-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
77+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7878

7979
%contains: results/General-4.sca
80-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
80+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8181

8282
%contains: results/General-5.sca
83-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
83+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8484

8585
%contains: results/General-6.sca
86-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
86+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8787

8888
%#--------------------------------------------------------------------------------------------------------------
8989
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true

‎tests/module/tcp_algorithm_newreno.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ description = "inet_TCP <---> inet_TCP with algorithms"
6565
%#################################################################################################################
6666

6767
%contains: results/General-0.sca
68-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
68+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
6969

7070
%contains: results/General-1.sca
71-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
71+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7272

7373
%contains: results/General-2.sca
74-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
74+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7575

7676
%contains: results/General-3.sca
77-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
77+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7878

7979
%contains: results/General-4.sca
80-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
80+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8181

8282
%contains: results/General-5.sca
83-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
83+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8484

8585
%contains: results/General-6.sca
86-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
86+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8787

8888
%#--------------------------------------------------------------------------------------------------------------
8989
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true

‎tests/module/tcp_algorithm_reno.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ description = "inet_TCP <---> inet_TCP with algorithms"
6565
%#################################################################################################################
6666

6767
%contains: results/General-0.sca
68-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
68+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
6969

7070
%contains: results/General-1.sca
71-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
71+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7272

7373
%contains: results/General-2.sca
74-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
74+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7575

7676
%contains: results/General-3.sca
77-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
77+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7878

7979
%contains: results/General-4.sca
80-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
80+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8181

8282
%contains: results/General-5.sca
83-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
83+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8484

8585
%contains: results/General-6.sca
86-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
86+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8787

8888
%#--------------------------------------------------------------------------------------------------------------
8989
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true

‎tests/module/tcp_algorithm_tahoe.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ description = "inet_TCP <---> inet_TCP with algorithms"
6565
%#################################################################################################################
6666

6767
%contains: results/General-0.sca
68-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
68+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
6969

7070
%contains: results/General-1.sca
71-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
71+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7272

7373
%contains: results/General-2.sca
74-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
74+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7575

7676
%contains: results/General-3.sca
77-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
77+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7878

7979
%contains: results/General-4.sca
80-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
80+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8181

8282
%contains: results/General-5.sca
83-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
83+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8484

8585
%contains: results/General-6.sca
86-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
86+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8787

8888
%#--------------------------------------------------------------------------------------------------------------
8989
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true

‎tests/module/tcp_algorithm_vegas.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ description = "inet_TCP <---> inet_TCP with algorithms"
6565
%#################################################################################################################
6666

6767
%contains: results/General-0.sca
68-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
68+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
6969

7070
%contains: results/General-1.sca
71-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
71+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7272

7373
%contains: results/General-2.sca
74-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
74+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7575

7676
%contains: results/General-3.sca
77-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
77+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7878

7979
%contains: results/General-4.sca
80-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
80+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8181

8282
%contains: results/General-5.sca
83-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
83+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8484

8585
%contains: results/General-6.sca
86-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
86+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8787

8888
%#--------------------------------------------------------------------------------------------------------------
8989
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true

‎tests/module/tcp_algorithm_westwood.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ description = "inet_TCP <---> inet_TCP with algorithms"
6565
%#################################################################################################################
6666

6767
%contains: results/General-0.sca
68-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
68+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
6969

7070
%contains: results/General-1.sca
71-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
71+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7272

7373
%contains: results/General-2.sca
74-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
74+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7575

7676
%contains: results/General-3.sca
77-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
77+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
7878

7979
%contains: results/General-4.sca
80-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
80+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8181

8282
%contains: results/General-5.sca
83-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
83+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8484

8585
%contains: results/General-6.sca
86-
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1000000
86+
scalar ClientServer.server.app[0] packetReceived:sum(packetBytes) 1e+06
8787

8888
%#--------------------------------------------------------------------------------------------------------------
8989
%postrun-command: grep "undisposed object:" test.out > test_undisposed.out || true

0 commit comments

Comments
 (0)