Rename to "unit" for consistency

Author: bremoran

Makefile

@@ -2,14 +2,14 @@
 # Copyright (c) The mldsa-native project authors
 # SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
 
-.PHONY: func kat acvp stack keccak \
-	func_44 kat_44 acvp_44 stack_44 \
-	func_65 kat_65 acvp_65 stack_65 keccak_65 \
-	func_87 kat_87 acvp_87 stack_87 keccak_87 \
-	run_func run_kat run_acvp run_stack run_keccak \
-	run_func_44 run_kat_44 run_stack_44 run_keccak_44 \
-	run_func_65 run_kat_65 run_stack_65 run_keccak_65 \
-	run_func_87 run_kat_87 run_stack_87 run_keccak_87 \
+.PHONY: func kat acvp stack unit \
+	func_44 kat_44 acvp_44 stack_44 unit_44 \
+	func_65 kat_65 acvp_65 stack_65 unit_65 \
+	func_87 kat_87 acvp_87 stack_87 unit_87 \
+	run_func run_kat run_acvp run_stack run_unit \
+	run_func_44 run_kat_44 run_stack_44 run_unit_44 \
+	run_func_65 run_kat_65 run_stack_65 run_unit_65 \
+	run_func_87 run_kat_87 run_stack_87 run_unit_87 \
 	bench_44 bench_65 bench_87 bench \
 	run_bench_44 run_bench_65 run_bench_87 run_bench \
 	bench_components_44 bench_components_65 bench_components_87 bench_components \
@@ -46,7 +46,7 @@ quickcheck: test
 build: func kat acvp
 	$(Q)echo "  Everything builds fine!"
 
-test: run_kat run_func run_acvp
+test: run_kat run_func run_acvp run_unit
 	$(Q)echo "  Everything checks fine!"
 
 run_kat_44: kat_44
@@ -108,22 +108,22 @@ run_stack_87: stack_87
 	$(Q)python3 scripts/stack $(MLDSA87_DIR)/bin/test_stack87 --build-dir $(MLDSA87_DIR) $(STACK_ANALYSIS_FLAGS)
 run_stack: run_stack_44 run_stack_65 run_stack_87
 
-# Keccak tests
-keccak_44: $(MLDSA44_DIR)/bin/test_keccak44
-	$(Q)echo "  KECCAK    ML-DSA-44:   $^"
-keccak_65: $(MLDSA65_DIR)/bin/test_keccak65
-	$(Q)echo "  KECCAK    ML-DSA-65:   $^"
-keccak_87: $(MLDSA87_DIR)/bin/test_keccak87
-	$(Q)echo "  KECCAK    ML-DSA-87:  $^"
-keccak: keccak_44 keccak_65 keccak_87
-
-run_keccak_44: keccak_44
-	$(W) $(MLDSA44_DIR)/bin/test_keccak44
-run_keccak_65: keccak_65
-	$(W) $(MLDSA65_DIR)/bin/test_keccak65
-run_keccak_87: keccak_87
-	$(W) $(MLDSA87_DIR)/bin/test_keccak87
-run_keccak: run_keccak_44 run_keccak_65 run_keccak_87
+# Unit tests
+unit_44: $(MLDSA44_DIR)/bin/test_unit44
+	$(Q)echo "  UNIT      ML-DSA-44:   $^"
+unit_65: $(MLDSA65_DIR)/bin/test_unit65
+	$(Q)echo "  UNIT      ML-DSA-65:   $^"
+unit_87: $(MLDSA87_DIR)/bin/test_unit87
+	$(Q)echo "  UNIT      ML-DSA-87:  $^"
+unit: unit_44 unit_65 unit_87
+
+run_unit_44: unit_44
+	$(W) $(MLDSA44_DIR)/bin/test_unit44
+run_unit_65: unit_65
+	$(W) $(MLDSA65_DIR)/bin/test_unit65
+run_unit_87: unit_87
+	$(W) $(MLDSA87_DIR)/bin/test_unit87
+run_unit: run_unit_44 run_unit_65 run_unit_87
 
 lib: $(BUILD_DIR)/libmldsa.a $(BUILD_DIR)/libmldsa44.a $(BUILD_DIR)/libmldsa65.a $(BUILD_DIR)/libmldsa87.a
 

test/mk/components.mk

@@ -14,7 +14,7 @@ ifeq ($(OPT),1)
 	CFLAGS += -DMLD_CONFIG_USE_NATIVE_BACKEND_ARITH -DMLD_CONFIG_USE_NATIVE_BACKEND_FIPS202
 endif
 
-ALL_TESTS = test_mldsa acvp_mldsa bench_mldsa bench_components_mldsa gen_KAT test_stack test_keccak
+ALL_TESTS = test_mldsa acvp_mldsa bench_mldsa bench_components_mldsa gen_KAT test_stack test_unit
 
 MLDSA44_DIR = $(BUILD_DIR)/mldsa44
 MLDSA65_DIR = $(BUILD_DIR)/mldsa65

test/test_keccak.c renamed to test/test_unit.c

@@ -453,9 +453,9 @@ int main(void)
   fails += test_x4_permute();
 
   if (fails) {
-    fprintf(stderr, "keccak tests: FAILED (%d failure%s)\n", fails, fails==1?"":"s");
+    fprintf(stderr, "unit tests: FAILED (%d failure%s)\n", fails, fails==1?"":"s");
     return 1;
   }
-  printf("keccak tests: OK\n");
+  printf("unit tests: OK\n");
   return 0;
 }