diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad6e84f..678b7fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -535,7 +535,8 @@ test: reports: junit: - SelfBench.xml - - Benchmark.xml + - JpegBenchmark.xml + - WebPBenchmark.xml script: - bash builder/test-vncserver diff --git a/spec/vncserver_adv_benchmarking_spec.py b/spec/vncserver_adv_benchmarking_spec.py index 8e4b10f..3ddc0c0 100644 --- a/spec/vncserver_adv_benchmarking_spec.py +++ b/spec/vncserver_adv_benchmarking_spec.py @@ -9,7 +9,14 @@ with description("Benchmarking"): kill_xvnc() with it("runs benchmarks"): run_cmd("wget --no-check-certificate https://kasmweb-build-artifacts.s3.us-east-1.amazonaws.com/kasmvnc/static/127072-737747495_small.mp4 -O /tmp/video.mp4") - completed_process = run_cmd("Xvnc -interface 0.0.0.0 :1 -Benchmark /tmp/video.mp4 -VideoArea 100") - command = '''sed -i "s/KasmVNC/$(grep -E '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') $(grep -E '^VERSION_CODENAME=' /etc/os-release | cut -d= -f2 | tr -d '"')/g" Benchmark.xml''' - run_cmd(command) + completed_process = run_cmd("Xvnc -interface 0.0.0.0 :1 -Benchmark /tmp/video.mp4 -VideoArea 100 -BenchmarkResults JpegBenchmark.xml") expect(completed_process.returncode).to(equal(0)) + + run_cmd('''sed -i "s/KasmVNC/$(grep -E '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') $(grep -E '^VERSION_CODENAME=' /etc/os-release | cut -d= -f2 | tr -d '"')/g" JpegBenchmark.xml''') + run_cmd("sed -i 's/testcase name=\"/testcase name=\"JPEG: /g' JpegBenchmark.xml") + + completed_process = run_cmd("Xvnc -interface 0.0.0.0 :1 -Benchmark /tmp/video.mp4 -VideoArea 100 -BenchmarkResults WebPBenchmark.xml") + expect(completed_process.returncode).to(equal(0)) + + run_cmd('''sed -i "s/KasmVNC/$(grep -E '^ID=' /etc/os-release | cut -d= -f2 | tr -d '"') $(grep -E '^VERSION_CODENAME=' /etc/os-release | cut -d= -f2 | tr -d '"')/g" WebPBenchmark.xml''') + run_cmd("sed -i 's/testcase name=\"/testcase name=\"WebP: /g' WebPBenchmark.xml")