wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix make distcheck

Browse Source
This commit is contained in:
John Safranek
2014-01-28 12:22:16 -08:00
parent 631cfbcf27
commit 2fe8477679
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit.c
View File

@@ -27,7 +27,7 @@ int main(int argc, char** argv)
err_sys("Cavium OpenNitroxDevice failed"); err_sys("Cavium OpenNitroxDevice failed");
#endif /* HAVE_CAVIUM */ #endif /* HAVE_CAVIUM */
if (CurrentDir("tests")) if (CurrentDir("tests") || CurrentDir("_build"))
ChangeDirBack(1); ChangeDirBack(1);
else if (CurrentDir("Debug") || CurrentDir("Release")) else if (CurrentDir("Debug") || CurrentDir("Release"))
ChangeDirBack(3); ChangeDirBack(3);

15
testsuite/testsuite.c
View File

@@ -51,11 +51,16 @@ enum {
NUMARGS = 3 NUMARGS = 3
}; };
#ifndef USE_WINDOWS_API
const char outputName[] = "/tmp/output";
#else
const char outputName[] = "output";
#endif
int myoptind = 0; int myoptind = 0;
char* myoptarg = NULL; char* myoptarg = NULL;
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
func_args server_args; func_args server_args;
@@ -79,7 +84,7 @@ int main(int argc, char** argv)
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
if (CurrentDir("testsuite")) if (CurrentDir("testsuite") || CurrentDir("_build"))
ChangeDirBack(1); ChangeDirBack(1);
else if (CurrentDir("Debug") || CurrentDir("Release")) else if (CurrentDir("Debug") || CurrentDir("Release"))
ChangeDirBack(3); /* Xcode->Preferences->Locations->Locations*/ ChangeDirBack(3); /* Xcode->Preferences->Locations->Locations*/
@@ -117,8 +122,8 @@ int main(int argc, char** argv)
strcpy(echo_args.argv[0], "echoclient"); strcpy(echo_args.argv[0], "echoclient");
strcpy(echo_args.argv[1], "input"); strcpy(echo_args.argv[1], "input");
strcpy(echo_args.argv[2], "output"); strcpy(echo_args.argv[2], outputName);
remove("output"); remove(outputName);
/* Share the signal, it has the new port number in it. */ /* Share the signal, it has the new port number in it. */
echo_args.signal = server_args.signal; echo_args.signal = server_args.signal;
@@ -146,7 +151,7 @@ int main(int argc, char** argv)
byte output[SHA256_DIGEST_SIZE]; byte output[SHA256_DIGEST_SIZE];
file_test("input", input); file_test("input", input);
file_test("output", output); file_test(outputName, output);
if (memcmp(input, output, sizeof(input)) != 0) if (memcmp(input, output, sizeof(input)) != 0)
return EXIT_FAILURE; return EXIT_FAILURE;
} }