fixes for make distcheck

Author: JacobBarthelmeh

scripts/fwd.test

@@ -8,7 +8,12 @@ then
   exit 77
 fi
 
-if [ ! -x ./scripts/fwd.test.expect ]
+# Automake sets $srcdir for tests. When building out-of-tree (e.g.
+# make distcheck), the expect script only lives in the source tree,
+# not the build tree. Fall back to the current directory otherwise.
+expect_script="${srcdir:-.}/scripts/fwd.test.expect"
+
+if [ ! -x "$expect_script" ]
 then
   echo "fail: missing expect script"
   exit 1
@@ -46,4 +51,4 @@ fi
 
 # Run the expect script
 
-./scripts/fwd.test.expect
+"$expect_script"

tests/regress.c

@@ -40,6 +40,7 @@
 #include <wolfssh/port.h>
 #include <wolfssh/ssh.h>
 #include <wolfssh/internal.h>
+#include <wolfssh/test.h>
 #ifdef WOLFSSH_SFTP
     #include <wolfssh/wolfsftp.h>
 #endif
@@ -1894,6 +1895,14 @@ int main(int argc, char** argv)
     (void)argc;
     (void)argv;
 
+    /* Tests load key files via relative paths (e.g. "keys/..."). When invoked
+     * from a build directory such as make distcheck's _build/sub, walk up to
+     * the source tree before running tests that read those files. */
+#if !defined(WOLFSSL_MDK_ARM) && !defined(WOLFSSL_KEIL_FS) && \
+    !defined(WOLFSSL_TIRTOS) && !defined(WOLFSSL_NUCLEUS)
+    ChangeToWolfSshRoot();
+#endif
+
     wolfSSH_Init();
 
     ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_CLIENT, NULL);