... and tests

tests/CMakeLists.txt

@@ -18,6 +18,28 @@ include_directories(
 	../include/compat
 )
 
+if(HOST_AARCH64)
+	include_directories(../crypto/arch/aarch64/)
+elseif(HOST_ARM)
+	include_directories(../crypto/arch/arm/)
+elseif(HOST_I386)
+	include_directories(../crypto/arch/i386/)
+elseif(HOST_MIPS64)
+	include_directories(../crypto/arch/mips64)
+elseif(HOST_MIPS)
+	# XXX - can this go away? the directory doesn't exist...
+elseif(HOST_POWERPC)
+	include_directories(../crypto/arch/powerpc)
+elseif(HOST_POWERPC64)
+	include_directories(../crypto/arch/powerpc64)
+elseif(HOST_RISCV64)
+	include_directories(../crypto/arch/riscv64)
+elseif(HOST_SPARC64)
+	include_directories(../crypto/arch/sparc64)
+elseif(HOST_X86_64)
+	include_directories(../crypto/arch/amd64)
+endif()
+
 add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_CURRENT_SOURCE_DIR}/../cert.pem\")
 
 file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} TEST_SOURCE_DIR)

tests/Makefile.am

@@ -19,6 +19,47 @@ AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl
 AM_CPPFLAGS += -I $(top_srcdir)/apps/openssl/compat
 AM_CPPFLAGS += -D_PATH_SSL_CA_FILE=\"$(top_srcdir)/cert.pem\"
 
+# arch
+if HOST_AARCH64
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/aarch64/
+endif
+
+if HOST_ARM
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/arm/
+endif
+
+if HOST_I386
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/i386/
+endif
+
+# XXX - do we still need this?
+if HOST_MIPS
+endif
+
+if HOST_MIPS64
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/mips64/
+endif
+
+if HOST_POWERPC
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc/
+endif
+
+if HOST_POWERPC64
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc64/
+endif
+
+if HOST_RISCV64
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/riscv64/
+endif
+
+if HOST_SPARC64
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/sparc64/
+endif
+
+if HOST_X86_64
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/arch/amd64/
+endif
+
 noinst_LTLIBRARIES = libtest.la
 libtest_la_LIBADD = $(libcrypto_la_objects)
 libtest_la_LIBADD += $(libcompat_la_objects)