Skip to content

Commit bed43db

Browse files
jgm1986jgm1986
committed
Merge branch 'develop'
2 parents e9809ac + c40cfea commit bed43db

7 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This repository contains all necessary for deploy HTTP/2 testing server or clien
55

66
## Version
77

8-
0.4.1
8+
0.4.2
99

1010

1111
## Installation
@@ -65,4 +65,4 @@ This repository contains a lot of tests for HTTP/2. The description about these
6565

6666
## License
6767

68-
[MIT](http://opensource.org/licenses/mit-license.html)
68+
[MIT](http://opensource.org/licenses/mit-license.html)

‎analysis/Tests Results Template.xlsx‎

62.6 KB
Binary file not shown.

‎analysis/calculator.py‎

100755100644
File mode changed.

‎analysis/clean_files.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
rm -r data/*.dat
2+
rm -r data/*.mdat
23
rm -r mean/*.mdat
34
rm -r mean/*.png

‎analysis/statistics.py‎

100644100755
File mode changed.

‎scripts/run_tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ for (( i=0; i<${#TestFilename[@]}; i++ ))
5858
ms) multiplier=1000 ;;
5959
us) multiplier=1 ;;
6060
*) echo "[ERROR] Not valid unit for total test time. Received: $valueUnit"
61+
i--
6162
continue;;
6263
esac
6364
responseTime=$(echo $responseTime | grep -Po '(\d+.*\d+)') # Deleting units from the value

‎scripts/test.list‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#--------------------------------------------------------
99
# TestName=(${TestName[@]} "/test/file_01.html")
1010
# TestFilename=(${TestFilename[@]} "h2c_7.2.1_$NUM_REPETI.dat")
11-
# TestParameter=(${TestParameter[@]} "-uvnas")
11+
# TestParameter=(${TestParameter[@]} "-uvnas -t 30")
1212
# TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
1313

1414

@@ -17,14 +17,14 @@
1717
#--------------------------------------------------------
1818
TestName=(${TestName[@]} "/test/test_01.html")
1919
TestFilename=(${TestFilename[@]} "h2c_Performance_01_$NUM_REPETI.dat")
20-
TestParameter=(${TestParameter[@]} "-uvnas")
20+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
2121
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
2222
#--------------------------------------------------------
2323
# 01 - H2: Performance Template 01
2424
#--------------------------------------------------------
2525
TestName=(${TestName[@]} "/test/test_01.html")
2626
TestFilename=(${TestFilename[@]} "h2_Performance_01_$NUM_REPETI.dat")
27-
TestParameter=(${TestParameter[@]} "-vnas")
27+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
2828
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
2929

3030

@@ -33,14 +33,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
3333
#--------------------------------------------------------
3434
TestName=(${TestName[@]} "/test/test_02.jpg")
3535
TestFilename=(${TestFilename[@]} "h2c_Performance_02_$NUM_REPETI.dat")
36-
TestParameter=(${TestParameter[@]} "-uvnas")
36+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
3737
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
3838
#--------------------------------------------------------
3939
# 03 - H2: Performance Template 02
4040
#--------------------------------------------------------
4141
TestName=(${TestName[@]} "/test/test_02.jpg")
4242
TestFilename=(${TestFilename[@]} "h2_Performance_02_$NUM_REPETI.dat")
43-
TestParameter=(${TestParameter[@]} "-vnas")
43+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
4444
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
4545

4646

@@ -49,14 +49,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
4949
#--------------------------------------------------------
5050
TestName=(${TestName[@]} "/test/test_03.html")
5151
TestFilename=(${TestFilename[@]} "h2c_Performance_03_$NUM_REPETI.dat")
52-
TestParameter=(${TestParameter[@]} "-uvnas")
52+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
5353
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
5454
#--------------------------------------------------------
5555
# 05 - H2: Performance Template 03
5656
#--------------------------------------------------------
5757
TestName=(${TestName[@]} "/test/test_03.html")
5858
TestFilename=(${TestFilename[@]} "h2_Performance_03_$NUM_REPETI.dat")
59-
TestParameter=(${TestParameter[@]} "-vnas")
59+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
6060
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
6161

6262

@@ -65,14 +65,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
6565
#--------------------------------------------------------
6666
TestName=(${TestName[@]} "/test/test_04.php")
6767
TestFilename=(${TestFilename[@]} "h2c_Performance_04_$NUM_REPETI.dat")
68-
TestParameter=(${TestParameter[@]} "-uvnas")
68+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
6969
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
7070
#--------------------------------------------------------
7171
# 07 - H2: Performance Template 04
7272
#--------------------------------------------------------
7373
TestName=(${TestName[@]} "/test/test_04.php")
7474
TestFilename=(${TestFilename[@]} "h2_Performance_04_$NUM_REPETI.dat")
75-
TestParameter=(${TestParameter[@]} "-vnas")
75+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
7676
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
7777

7878

@@ -81,14 +81,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
8181
#--------------------------------------------------------
8282
TestName=(${TestName[@]} "/test/test_05.txt")
8383
TestFilename=(${TestFilename[@]} "h2c_Performance_05_$NUM_REPETI.dat")
84-
TestParameter=(${TestParameter[@]} "-uvnas")
84+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
8585
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
8686
#--------------------------------------------------------
8787
# 09 - H2: Performance Template 05
8888
#--------------------------------------------------------
8989
TestName=(${TestName[@]} "/test/test_05.txt")
9090
TestFilename=(${TestFilename[@]} "h2_Performance_05_$NUM_REPETI.dat")
91-
TestParameter=(${TestParameter[@]} "-vnas")
91+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
9292
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
9393

9494

@@ -97,14 +97,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
9797
#--------------------------------------------------------
9898
TestName=(${TestName[@]} "/test/test_06.html")
9999
TestFilename=(${TestFilename[@]} "h2c_Performance_06_$NUM_REPETI.dat")
100-
TestParameter=(${TestParameter[@]} "-uvnas")
100+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
101101
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
102102
#--------------------------------------------------------
103103
# 11 - H2: Performance Template 06
104104
#--------------------------------------------------------
105105
TestName=(${TestName[@]} "/test/test_06.html")
106106
TestFilename=(${TestFilename[@]} "h2_Performance_06_$NUM_REPETI.dat")
107-
TestParameter=(${TestParameter[@]} "-vnas")
107+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
108108
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
109109

110110

@@ -113,14 +113,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
113113
#--------------------------------------------------------
114114
TestName=(${TestName[@]} "/test/test_10.html")
115115
TestFilename=(${TestFilename[@]} "h2c_Performance_10_$NUM_REPETI.dat")
116-
TestParameter=(${TestParameter[@]} "-uvnas")
116+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
117117
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
118118
#--------------------------------------------------------
119119
# 13 - H2: Performance Template 10
120120
#--------------------------------------------------------
121121
TestName=(${TestName[@]} "/test/test_10.html")
122122
TestFilename=(${TestFilename[@]} "h2_Performance_10_$NUM_REPETI.dat")
123-
TestParameter=(${TestParameter[@]} "-vnas")
123+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
124124
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
125125

126126

@@ -129,12 +129,12 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
129129
#--------------------------------------------------------
130130
TestName=(${TestName[@]} "/test/test_11.html")
131131
TestFilename=(${TestFilename[@]} "h2c_Performance_11_$NUM_REPETI.dat")
132-
TestParameter=(${TestParameter[@]} "-uvnas")
132+
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
133133
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
134134
#--------------------------------------------------------
135135
# 15 - H2: Performance Template 11
136136
#--------------------------------------------------------
137137
TestName=(${TestName[@]} "/test/test_11.html")
138138
TestFilename=(${TestFilename[@]} "h2_Performance_11_$NUM_REPETI.dat")
139-
TestParameter=(${TestParameter[@]} "-vnas")
139+
TestParameter=(${TestParameter[@]} "-vnas -t 30")
140140
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")

0 commit comments

Comments
 (0)