diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-03-11 19:00:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-11 19:00:42 +0100 |
| commit | fe25bb7b9dce56302556b1980c59337e04147e6a (patch) | |
| tree | f1fd58a5737dd409510e5e850aa0ab2f5bc6cf66 | |
| parent | ab87b8ef0af7ef888b7d810db610ead6eb784d71 (diff) | |
| parent | 046d5570beaf4362516e5dff913a22bb001116ca (diff) | |
| download | PROJ-fe25bb7b9dce56302556b1980c59337e04147e6a.tar.gz PROJ-fe25bb7b9dce56302556b1980c59337e04147e6a.zip | |
Merge pull request #855 from rouault/mingw32_less_multistresstest_iterations
mingw32 travis: reduce number of iterations for multistresstest
| -rw-r--r-- | src/multistresstest.c | 7 | ||||
| -rwxr-xr-x | travis/mingw32/install.sh | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/multistresstest.c b/src/multistresstest.c index e32c7ae4..adedb8bd 100644 --- a/src/multistresstest.c +++ b/src/multistresstest.c @@ -39,7 +39,7 @@ #endif #define num_threads 10 -#define num_iterations 1000000 +static int num_iterations = 1000000; static int reinit_every_iteration=0; static int add_no_defs = 0; @@ -459,6 +459,11 @@ int main( int argc, char **argv ) reinit_every_iteration = 1; else if( strcmp(argv[i], "-add_no_defs") == 0 ) add_no_defs = 1; + else if( strcmp(argv[i], "-num_iterations") == 0 && i+1 < argc ) + { + num_iterations = atoi(argv[i+1]); + i++; + } } #ifdef _WIN32 diff --git a/travis/mingw32/install.sh b/travis/mingw32/install.sh index b1ea07c8..49e395a5 100755 --- a/travis/mingw32/install.sh +++ b/travis/mingw32/install.sh @@ -33,6 +33,6 @@ cd src make multistresstest.exe make test228.exe cd .. -PROJ_LIB=../nad src/multistresstest.exe +PROJ_LIB=../nad src/multistresstest.exe -num_iterations 100000 cd .. |