wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #162 from kaleb-himes/master

Browse Source 
Modified scope for ChangeDirToRoot
This commit is contained in:
toddouska
2015-10-10 09:32:56 -07:00
parent ea1040cfe4 7364884a69
commit d18339f5f7
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
testsuite/testsuite.c
View File

@@ -29,6 +29,25 @@
#include <wolfssl/test.h> #include <wolfssl/test.h>
#include "wolfcrypt/test/test.h" #include "wolfcrypt/test/test.h"
/* This function changes the current directory to the wolfssl root */
static void ChangeDirToRoot(void)
{
/* Normal Command Line=_build, Visual Studio=testsuite */
if (CurrentDir("testsuite") || CurrentDir("_build")) {
ChangeDirBack(1);
}
/* Xcode: To output application to correct location: */
/* 1. Xcode->Preferences->Locations->Locations */
/* 2. Derived Data Advanced -> Custom */
/* 3. Relative to Workspace, Build/Products */
/* Build/Products/Debug or Build/Products/Release */
else if (CurrentDir("Debug") || CurrentDir("Release")) {
ChangeDirBack(5);
}
}
#ifndef SINGLE_THREADED #ifndef SINGLE_THREADED
#include <wolfssl/openssl/ssl.h> #include <wolfssl/openssl/ssl.h>
@@ -53,24 +72,6 @@ static const char *outputName;
int myoptind = 0; int myoptind = 0;
char* myoptarg = NULL; char* myoptarg = NULL;
// This function changes the current directory to the wolfssl root
static void ChangeDirToRoot(void)
{
/* Normal Command Line=_build, Visual Studio=testsuite */
if (CurrentDir("testsuite") || CurrentDir("_build")) {
ChangeDirBack(1);
}
/* Xcode: To output application to correct location: */
/* 1. Xcode->Preferences->Locations->Locations */
/* 2. Derived Data Advanced -> Custom */
/* 3. Relative to Workspace, Build/Products */
/* Build/Products/Debug or Build/Products/Release */
else if (CurrentDir("Debug") || CurrentDir("Release")) {
ChangeDirBack(5);
}
}
#ifndef NO_TESTSUITE_MAIN_DRIVER #ifndef NO_TESTSUITE_MAIN_DRIVER
static int testsuite_test(int argc, char** argv); static int testsuite_test(int argc, char** argv);