Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../mldsa/src/poly.h"
#include "../mldsa/src/polyvec.h"
#include "../mldsa/src/randombytes.h"
#include "../../mldsa/src/poly.h"
#include "../../mldsa/src/polyvec.h"
#include "../../mldsa/src/randombytes.h"
#include "hal.h"

#define NWARMUP 50
Expand Down
4 changes: 2 additions & 2 deletions test/bench_mldsa.c → test/bench/bench_mldsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../mldsa/src/randombytes.h"
#include "../mldsa/src/sign.h"
#include "../../mldsa/src/randombytes.h"
#include "../../mldsa/src/sign.h"
#include "hal.h"

#define NWARMUP 3
Expand Down
8 changes: 4 additions & 4 deletions test/mk/components.mk
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ $(MLDSA87_DIR)/bin/%: CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87
# Link tests with respective library (except test_unit which includes sources directly)
define ADD_SOURCE
$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): LDLIBS += -L$(BUILD_DIR) -l$(1)
$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): $(BUILD_DIR)/$(1)/test/$(3)$(2).c.o $(BUILD_DIR)/lib$(1).a
$(BUILD_DIR)/$(1)/bin/$(2)$(subst mldsa,,$(1)): $(BUILD_DIR)/$(1)/test/$(3)/$(2).c.o $(BUILD_DIR)/lib$(1).a
endef


Expand All @@ -148,13 +148,13 @@ endef

$(foreach scheme,mldsa44 mldsa65 mldsa87, \
$(foreach test,$(ACVP_TESTS), \
$(eval $(call ADD_SOURCE,$(scheme),$(test),acvp/)) \
$(eval $(call ADD_SOURCE,$(scheme),$(test),acvp)) \
) \
$(foreach test,$(BENCH_TESTS), \
$(eval $(call ADD_SOURCE,$(scheme),$(test),)) \
$(eval $(call ADD_SOURCE,$(scheme),$(test),bench)) \
) \
$(foreach test,$(BASIC_TESTS), \
$(eval $(call ADD_SOURCE,$(scheme),$(test),src/)) \
$(eval $(call ADD_SOURCE,$(scheme),$(test),src)) \
) \
$(eval $(call ADD_SOURCE_UNIT,$(scheme))) \
$(eval $(call ADD_SOURCE_ALLOC,$(scheme))) \
Expand Down