From 0d6018bab64b96729cca0d36a141295dfd8d93b3 Mon Sep 17 00:00:00 2001
From: Anjan Roy <hello@itzmeanjan.in>
Date: Fri, 2 Feb 2024 18:58:55 +0400
Subject: [PATCH] use gtest-parallel to run all tests in parallel

Signed-off-by: Anjan Roy <hello@itzmeanjan.in>
---
 Makefile                        | 11 ++++++++---
 benchmarks/bench_ascon_xofa.cpp |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index db22bb3..12c035b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,12 @@ BUILD_DIR = build
 
 TEST_DIR = tests
 TEST_SOURCES := $(wildcard $(TEST_DIR)/*.cpp)
+TEST_HEADERS := $(wildcard $(TEST_DIR)/*.hpp)
 TEST_BUILD_DIR := $(BUILD_DIR)/$(TEST_DIR)
 TEST_OBJECTS := $(addprefix $(TEST_BUILD_DIR)/, $(notdir $(patsubst %.cpp,%.o,$(TEST_SOURCES))))
 TEST_LINK_FLAGS = -lgtest -lgtest_main
 TEST_BINARY = $(TEST_BUILD_DIR)/test.out
+GTEST_PARALLEL = ./gtest-parallel/gtest-parallel
 
 BENCHMARK_DIR = benchmarks
 BENCHMARK_SOURCES := $(wildcard $(BENCHMARK_DIR)/*.cpp)
@@ -48,14 +50,17 @@ $(PERF_BUILD_DIR): $(BUILD_DIR)
 $(SUBTLE_INC_DIR):
 	git submodule update --init
 
+$(GTEST_PARALLEL): $(SUBTLE_INC_DIR)
+	git submodule update --init
+
 $(TEST_BUILD_DIR)/%.o: $(TEST_DIR)/%.cpp $(TEST_BUILD_DIR)
 	$(CXX) $(CXX_FLAGS) $(WARN_FLAGS) $(OPT_FLAGS) $(I_FLAGS) $(DEP_IFLAGS) -c $< -o $@
 
 $(TEST_BINARY): $(TEST_OBJECTS)
 	$(CXX) $(OPT_FLAGS) $(LINK_FLAGS) $^ $(TEST_LINK_FLAGS) -o $@
 
-test: $(TEST_BINARY)
-	./$<
+test: $(TEST_BINARY) $(GTEST_PARALLEL)
+	$(GTEST_PARALLEL) $< --print_test_times
 
 $(BENCHMARK_BUILD_DIR)/%.o: $(BENCHMARK_DIR)/%.cpp $(BENCHMARK_BUILD_DIR)
 	$(CXX) $(CXX_FLAGS) $(WARN_FLAGS) $(OPT_FLAGS) $(I_FLAGS) $(DEP_IFLAGS) -c $< -o $@
@@ -82,5 +87,5 @@ perf: $(PERF_BINARY)
 clean:
 	rm -rf $(BUILD_DIR)
 
-format: $(ASCON_SOURCES) $(TEST_SOURCES) $(BENCHMARK_SOURCES) $(BENCHMARK_HEADERS)
+format: $(ASCON_SOURCES) $(TEST_SOURCES) $(TEST_HEADERS) $(BENCHMARK_SOURCES) $(BENCHMARK_HEADERS)
 	clang-format -i $^
diff --git a/benchmarks/bench_ascon_xofa.cpp b/benchmarks/bench_ascon_xofa.cpp
index a96bf51..9edbf1f 100644
--- a/benchmarks/bench_ascon_xofa.cpp
+++ b/benchmarks/bench_ascon_xofa.cpp
@@ -44,7 +44,7 @@ bench_ascon_xofa(benchmark::State& state)
 BENCHMARK(bench_ascon_xofa)
   ->ArgsProduct({
     benchmark::CreateRange(1 << 6, 1 << 12, 4), // input, to be absorbed
-    {  64 }                                  // output, to be squeezed
+    { 64 }                                      // output, to be squeezed
   })
   ->Name("ascon_xofa")
   ->ComputeStatistics("min", compute_min)