Fixed a problem in test-scenario-pre-post-nop-all.r

Signed-off-by: George Milescu <george.milescu@gmail.com>

diff --git a/TestSpecs/test-campaign.html b/TestSpecs/test-campaign.html
index 216641ba87600f38e27069e86fc07ac9490b515c..8e38f129d52ea94d99eda180cf0b3e5d56bfe24c 100644 (file)
--- a/TestSpecs/test-campaign.html
+++ b/TestSpecs/test-campaign.html
@@ -145,6 +145,13 @@
               <td>8 Mbit/s up only</td>
               <td><a href="test-scenario-pre-post-nop-many/test-scenario-pre-post-nop-dlspeed-percent.png">dlspeed vs percent</a>; <a href="test-scenario-pre-post-nop-many/test-scenario-pre-post-nop-dlspeed-time.png">dlspeed vs time</a></td>
             </tr>
+            <tr>
+              <td>scenario-pre-post-nop-all</td>
+              <td>1</td>
+              <td>89</td>
+              <td>8 Mbit/s up/down</td>
+              <td><a href="test-scenario-pre-post-nop-all/test-scenario-pre-post-nop-all-dlspeed-percent.png">dlspeed vs percent</a>; <a href="test-scenario-pre-post-nop-all/test-scenario-pre-post-nop-all-dlspeed-time.png">dlspeed vs time</a></td>
+            </tr>
           </tbody>
         </table>
       </div>

diff --git a/TestSpecs/test-scenario-pre-post-nop-all.r b/TestSpecs/test-scenario-pre-post-nop-all.r
index 089956f6d54713887931c549a4643948b5bbfca4..641da8c1a964accc18b21010264dc3c98b201181 100644 (file)
--- a/TestSpecs/test-scenario-pre-post-nop-all.r
+++ b/TestSpecs/test-scenario-pre-post-nop-all.r
@@ -297,12 +297,12 @@ scale_colour_manual("Legend") +
 opts(title=paste(campaign_name, "test-scenario-pre-post-nop-all: a test swarm (1 Seeder, 89 Leechers), all peers have an 8 Mbit/s upload BW limitation", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "test-scenario-pre-post-nop--all-dlspeed-percent.eps", sep="/"))
+postscript(paste(target_folder, "test-scenario-pre-post-nop-all-dlspeed-percent.eps", sep="/"))
 print(p)
 dev.off()
 
 # plot data as an png file
-png(paste(target_folder, "test-scenario-pre-post-nop--all-dlspeed-percent.png", sep="/"), width = 1280, height = 800)
+png(paste(target_folder, "test-scenario-pre-post-nop-all-dlspeed-percent.png", sep="/"), width = 1280, height = 800)
 print(p)
 dev.off()
 
@@ -404,14 +404,14 @@ scale_x_continuous("Time(s)") +
 scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) +
 coord_cartesian() +
 scale_colour_manual("Legend") +
-opts(title=paste(campaign_name, "test-scenario-pre-post-nop-many: a test swarm (1 Seeder, 8 Leechers), all peers have an 8 Mbit/s upload BW limitation", sep="\n"))
+opts(title=paste(campaign_name, "test-scenario-pre-post-nop-all: a test swarm (1 Seeder, 89 Leechers), all peers have an 8 Mbit/s upload BW limitation", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-time.eps", sep="/"))
+postscript(paste(target_folder, "test-scenario-pre-post-nop-all-dlspeed-time.eps", sep="/"))
 print(p)
 dev.off()
 
 # plot data as an png file
-png(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-time.png", sep="/"), width = 1280, height = 800)
+png(paste(target_folder, "test-scenario-pre-post-nop-all-dlspeed-time.png", sep="/"), width = 1280, height = 800)
 print(p)
 dev.off()