From 749a68a5bc0a1818c5d1d8515da5a9bb89d5b946 Mon Sep 17 00:00:00 2001
From: Amaury Chamayou <amchamay@microsoft.com>
Date: Fri, 17 May 2024 16:30:33 +0000
Subject: [PATCH] Run more tests

---
 .github/workflows/bencher.yml | 6 +++++-
 cmake/common.cmake            | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/bencher.yml b/.github/workflows/bencher.yml
index 21645edb8b8a..bdaa7000811f 100644
--- a/.github/workflows/bencher.yml
+++ b/.github/workflows/bencher.yml
@@ -1,3 +1,5 @@
+name: "Continous Benchmarking"
+
 on:
     push:
       branches: bencher_experiment
@@ -19,7 +21,9 @@ jobs:
             cd build
             cmake -GNinja -DCOMPILE_TARGET=virtual ..
             ninja
-            ./tests.sh -VV -R pi_basic_virtual_cft
+            ./tests.sh -VV -R pi_basic_virtual
+            ./tests.sh -VV -R historical_query
+            ./tests.sh -VV -R commit_latency
 
         - uses: bencherdev/bencher@main
         - name: Track base branch benchmarks with Bencher
diff --git a/cmake/common.cmake b/cmake/common.cmake
index 71500fa6c2c0..4d24f9dc0936 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -211,18 +211,14 @@ function(add_perf_test)
     set(ENCLAVE_TYPE "virtual")
   endif()
 
-  set(TESTS_SUFFIX "${TESTS_SUFFIX}_cft")
-
   set(TEST_NAME "${PARSED_ARGS_NAME}${TESTS_SUFFIX}")
 
-  set(LABEL_ARG "${TEST_NAME}^")
-
   add_test(
     NAME "${PARSED_ARGS_NAME}${TESTS_SUFFIX}"
     COMMAND
       ${PYTHON} ${PARSED_ARGS_PYTHON_SCRIPT} -b . -c ${PARSED_ARGS_CLIENT_BIN}
       ${CCF_NETWORK_TEST_ARGS} ${PARSED_ARGS_CONSTITUTION} --write-tx-times
-      ${VERIFICATION_ARG} --label ${LABEL_ARG} --snapshot-tx-interval 10000
+      ${VERIFICATION_ARG} --label ${TEST_NAME} --snapshot-tx-interval 10000
       ${PARSED_ARGS_ADDITIONAL_ARGS} -e ${ENCLAVE_TYPE} -t ${ENCLAVE_PLATFORM}
       ${NODES}
   )