diff options
| author | Marti Maria <marti.maria@littlecms.com> | 2021-11-07 18:00:37 +0100 |
|---|---|---|
| committer | Marti Maria <marti.maria@littlecms.com> | 2021-11-07 18:00:37 +0100 |
| commit | a37361adf91baf37121ff283773c5eafa9045473 (patch) | |
| tree | e61122f3d027c1e7685373e1453df4d0da0c4589 | |
| parent | afbe6cf679df7381fb330a14cfba7feec46325a5 (diff) | |
| download | lcms2-a37361adf91baf37121ff283773c5eafa9045473.tar.gz | |
try to fix github action
by adding testbed command line param
| -rw-r--r-- | .github/workflows/build.yml | 10 | ||||
| -rw-r--r-- | testbed/testcms2.c | 4 | ||||
| -rwxr-xr-x | testbed/testcms2.h | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bff643..e0c3865 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,9 +46,8 @@ jobs: - name: Build Windows 64 bit run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|x64" /Project testbed - - name: Run tests - working-directory: .\testbed - run: testbed.exe + - name: Run tests + run: testbed\testbed.exe --chdir testbed Windows-32: @@ -62,9 +61,8 @@ jobs: - name: Build Windows 32 bit run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|Win32" /Project testbed - - name: Run tests - working-directory: .\testbed - run: testbed.exe + - name: Run tests + run: testbed\testbed.exe --chdir testbed Ubuntu-meson: diff --git a/testbed/testcms2.c b/testbed/testcms2.c index 0322d6d..4098b59 100644 --- a/testbed/testcms2.c +++ b/testbed/testcms2.c @@ -9179,6 +9179,10 @@ int main(int argc, char* argv[]) Exhaustive = 1; printf("Running exhaustive tests (will take a while...)\n\n"); } + else + if ((argc == 3) && strcmp(argv[1], "--chdir") == 0) { + CHDIR(argv[2]); + } #ifdef LCMS_FAST_EXTENSIONS printf("Installing fast float extension ..."); diff --git a/testbed/testcms2.h b/testbed/testcms2.h index f15ae3f..97beb6b 100755 --- a/testbed/testcms2.h +++ b/testbed/testcms2.h @@ -40,6 +40,11 @@ #ifdef CMS_IS_WINDOWS_ # include <io.h> +# include <direct.h> +# define CHDIR(a) _chdir(a) +#else +# include <unistd.h> +# define CHDIR(a) chdir(a) #endif #define cmsmin(a, b) (((a) < (b)) ? (a) : (b)) |