From 5c5b4087e489324d18e9237a9e2bc30309a27772 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Wed, 5 Feb 2025 10:15:56 +0200 Subject: [PATCH] Fix --- .github/workflows/bench.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index fd630e1119..0b8dfe60d4 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -40,7 +40,7 @@ jobs: submodules: true persist-credentials: false - - name: Checkout gquiche + - name: Checkout google/quiche uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: google/quiche @@ -84,7 +84,7 @@ jobs: cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQUIC_BUILD_TOOLS=1 -DQUIC_BUILD_PERF=1 .. cmake --build . - - name: Build gquiche + - name: Build google/quiche run: | cd gquiche bazel build -c opt --sandbox_writable_path=/home/bench/.cache/sccache quiche:quic_server quiche:quic_client @@ -119,14 +119,14 @@ jobs: # Compare various configurations of neqo against msquic, and gather perf data # during the hyperfine runs. - - name: Compare neqo, msquic and gquiche + - name: Compare neqo, msquic and google/quiche env: HOST: 127.0.0.1 PORT: 4433 SIZE: 33554432 # 32 MB run: | TMP=$(mktemp -d) - # Make a cert and key for msquic and gquiche. + # Make a cert and key for msquic and google. openssl req -nodes -new -x509 -keyout "$TMP/key" -out "$TMP/cert" -subj "/CN=DOMAIN" 2>/dev/null # Make a test file for msquic to serve. truncate -s "$SIZE" "$TMP/$SIZE" @@ -134,18 +134,18 @@ jobs: declare -A client_cmd=( ["neqo"]="target/release/neqo-client _cc _pacing --output-dir . _flags -Q 1 https://$HOST:$PORT/$SIZE" ["msquic"]="msquic/build/bin/Release/quicinterop -test:D -custom:$HOST -port:$PORT -urls:https://$HOST:$PORT/$SIZE" - ["gquiche"]="gquiche/bazel-bin/quiche/quic_client --disable_certificate_verification https://$HOST:$PORT/$SIZE > $SIZE" + ["google"]="gquiche/bazel-bin/quiche/quic_client --disable_certificate_verification https://$HOST:$PORT/$SIZE > $SIZE" ) declare -A server_cmd=( ["neqo"]="target/release/neqo-server _cc _pacing _flags -Q 1 $HOST:$PORT" ["msquic"]="msquic/build/bin/Release/quicinteropserver -root:$TMP -listen:$HOST -port:$PORT -file:$TMP/cert -key:$TMP/key -noexit" - ["gquiche"]="gquiche/bazel-bin/quiche/quic_server --generate_dynamic_responses --port $PORT --certificate_file $TMP/cert --key_file $TMP/key" + ["google"]="gquiche/bazel-bin/quiche/quic_server --generate_dynamic_responses --port $PORT --certificate_file $TMP/cert --key_file $TMP/key" ) # Flags to pass to neqo when it runs against another implementation. declare -A neqo_flags=( ["neqo"]="" ["msquic"]="-a hq-interop" - ["gquiche"]="" + ["google"]="" ) # Replace various placeholders in the commands with the actual values.