Skip to content

Commit 5a508e8

Browse files
jgm1986jgm1986
committed
Merge branch 'develop'
2 parents bed43db + dc93ce5 commit 5a508e8

4 files changed

Lines changed: 44 additions & 21 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
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.2
8+
0.4.3
99

1010

1111
## Installation

‎scripts/README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ You have to define the amount number that each test will be executed as input pa
1919

2020
The results of the tests, will be saved under "results" directory. The name of the output file, is defined on "test.list" file individually for each test.
2121

22+
It is possible launch the tests on second plane and saving the output to an external file is using:
23+
24+
```sh
25+
$ nohup ./run_tests.sh 1000 > testsOutput.log &
26+
```
27+
2228

2329
## Config file
2430

@@ -57,4 +63,4 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
5763

5864
The user only have to modify the values between double quotes for defined or customize a test.
5965

60-
**WARNING:** The rest of the code inside test.list file must be the same without changes.
66+
**WARNING:** The rest of the code inside test.list file must be the same without changes.

‎scripts/run_tests.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ for (( i=0; i<${#TestFilename[@]}; i++ ))
3535
continue
3636
fi
3737
# Creating the command to be execcuted
38-
FULL_COMMAND="$NGHTTP2 ${TestParameter[$i]} ${TestUrlPreamb[$i]}$URL:$PORT${TestName[$i]}"
38+
FULL_COMMAND="$NGHTTP2 ${TestParameter[$i]} ${TestTimeOut[$i]} ${TestUrlPreamb[$i]}$URL:$PORT${TestName[$i]}"
3939
echo "[ COMMAND ] $FULL_COMMAND"
4040

4141
for(( j= 0; j<$NUM_REPETI; j++ ))
@@ -58,7 +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--
61+
j=$((j-1))
6262
continue;;
6363
esac
6464
responseTime=$(echo $responseTime | grep -Po '(\d+.*\d+)') # Deleting units from the value

‎scripts/test.list‎

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

1415

@@ -17,14 +18,16 @@
1718
#--------------------------------------------------------
1819
TestName=(${TestName[@]} "/test/test_01.html")
1920
TestFilename=(${TestFilename[@]} "h2c_Performance_01_$NUM_REPETI.dat")
20-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
21+
TestParameter=(${TestParameter[@]} "-uvnas")
22+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
2123
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
2224
#--------------------------------------------------------
2325
# 01 - H2: Performance Template 01
2426
#--------------------------------------------------------
2527
TestName=(${TestName[@]} "/test/test_01.html")
2628
TestFilename=(${TestFilename[@]} "h2_Performance_01_$NUM_REPETI.dat")
27-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
29+
TestParameter=(${TestParameter[@]} "-vnas")
30+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
2831
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
2932

3033

@@ -33,14 +36,16 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
3336
#--------------------------------------------------------
3437
TestName=(${TestName[@]} "/test/test_02.jpg")
3538
TestFilename=(${TestFilename[@]} "h2c_Performance_02_$NUM_REPETI.dat")
36-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
39+
TestParameter=(${TestParameter[@]} "-uvnas")
40+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
3741
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
3842
#--------------------------------------------------------
3943
# 03 - H2: Performance Template 02
4044
#--------------------------------------------------------
4145
TestName=(${TestName[@]} "/test/test_02.jpg")
4246
TestFilename=(${TestFilename[@]} "h2_Performance_02_$NUM_REPETI.dat")
43-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
47+
TestParameter=(${TestParameter[@]} "-vnas")
48+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
4449
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
4550

4651

@@ -49,14 +54,16 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
4954
#--------------------------------------------------------
5055
TestName=(${TestName[@]} "/test/test_03.html")
5156
TestFilename=(${TestFilename[@]} "h2c_Performance_03_$NUM_REPETI.dat")
52-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
57+
TestParameter=(${TestParameter[@]} "-uvnas")
58+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
5359
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
5460
#--------------------------------------------------------
5561
# 05 - H2: Performance Template 03
5662
#--------------------------------------------------------
5763
TestName=(${TestName[@]} "/test/test_03.html")
5864
TestFilename=(${TestFilename[@]} "h2_Performance_03_$NUM_REPETI.dat")
59-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
65+
TestParameter=(${TestParameter[@]} "-vnas")
66+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
6067
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
6168

6269

@@ -65,14 +72,16 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
6572
#--------------------------------------------------------
6673
TestName=(${TestName[@]} "/test/test_04.php")
6774
TestFilename=(${TestFilename[@]} "h2c_Performance_04_$NUM_REPETI.dat")
68-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
75+
TestParameter=(${TestParameter[@]} "-uvnas")
76+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
6977
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
7078
#--------------------------------------------------------
7179
# 07 - H2: Performance Template 04
7280
#--------------------------------------------------------
7381
TestName=(${TestName[@]} "/test/test_04.php")
7482
TestFilename=(${TestFilename[@]} "h2_Performance_04_$NUM_REPETI.dat")
75-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
83+
TestParameter=(${TestParameter[@]} "-vnas")
84+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
7685
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
7786

7887

@@ -81,14 +90,16 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
8190
#--------------------------------------------------------
8291
TestName=(${TestName[@]} "/test/test_05.txt")
8392
TestFilename=(${TestFilename[@]} "h2c_Performance_05_$NUM_REPETI.dat")
84-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
93+
TestParameter=(${TestParameter[@]} "-uvnas")
94+
TestTimeOut=(${TestTimeOut[@]} "--timeout=300")
8595
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
8696
#--------------------------------------------------------
8797
# 09 - H2: Performance Template 05
8898
#--------------------------------------------------------
8999
TestName=(${TestName[@]} "/test/test_05.txt")
90100
TestFilename=(${TestFilename[@]} "h2_Performance_05_$NUM_REPETI.dat")
91-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
101+
TestParameter=(${TestParameter[@]} "-vnas")
102+
TestTimeOut=(${TestTimeOut[@]} "--timeout=300")
92103
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
93104

94105

@@ -97,14 +108,16 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
97108
#--------------------------------------------------------
98109
TestName=(${TestName[@]} "/test/test_06.html")
99110
TestFilename=(${TestFilename[@]} "h2c_Performance_06_$NUM_REPETI.dat")
100-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
111+
TestParameter=(${TestParameter[@]} "-uvnas")
112+
TestTimeOut=(${TestTimeOut[@]} "--timeout=300")
101113
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
102114
#--------------------------------------------------------
103115
# 11 - H2: Performance Template 06
104116
#--------------------------------------------------------
105117
TestName=(${TestName[@]} "/test/test_06.html")
106118
TestFilename=(${TestFilename[@]} "h2_Performance_06_$NUM_REPETI.dat")
107-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
119+
TestParameter=(${TestParameter[@]} "-vnas")
120+
TestTimeOut=(${TestTimeOut[@]} "--timeout=300")
108121
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
109122

110123

@@ -113,14 +126,16 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
113126
#--------------------------------------------------------
114127
TestName=(${TestName[@]} "/test/test_10.html")
115128
TestFilename=(${TestFilename[@]} "h2c_Performance_10_$NUM_REPETI.dat")
116-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
129+
TestParameter=(${TestParameter[@]} "-uvnas")
130+
TestTimeOut=(${TestTimeOut[@]} "--timeout=2000")
117131
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
118132
#--------------------------------------------------------
119133
# 13 - H2: Performance Template 10
120134
#--------------------------------------------------------
121135
TestName=(${TestName[@]} "/test/test_10.html")
122136
TestFilename=(${TestFilename[@]} "h2_Performance_10_$NUM_REPETI.dat")
123-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
137+
TestParameter=(${TestParameter[@]} "-vnas")
138+
TestTimeOut=(${TestTimeOut[@]} "--timeout=2000")
124139
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
125140

126141

@@ -129,12 +144,14 @@ TestUrlPreamb=(${TestUrlPreamb[@]} "https://")
129144
#--------------------------------------------------------
130145
TestName=(${TestName[@]} "/test/test_11.html")
131146
TestFilename=(${TestFilename[@]} "h2c_Performance_11_$NUM_REPETI.dat")
132-
TestParameter=(${TestParameter[@]} "-uvnas -t 30")
147+
TestParameter=(${TestParameter[@]} "-uvnas")
148+
TestTimeOut=(${TestTimeOut[@]} "--timeout=30")
133149
TestUrlPreamb=(${TestUrlPreamb[@]} "http://")
134150
#--------------------------------------------------------
135151
# 15 - H2: Performance Template 11
136152
#--------------------------------------------------------
137153
TestName=(${TestName[@]} "/test/test_11.html")
138154
TestFilename=(${TestFilename[@]} "h2_Performance_11_$NUM_REPETI.dat")
139-
TestParameter=(${TestParameter[@]} "-vnas -t 30")
155+
TestParameter=(${TestParameter[@]} "-vnas")
156+
TestTimeOut=(${TestTimeOut[@]} "--timeout=300")
140157
TestUrlPreamb=(${TestUrlPreamb[@]} "https://")

0 commit comments

Comments
 (0)