diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-12-10 10:17:38 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-10 10:17:38 -0800 |
| commit | c60a8bfe9c225a58080839f1598365e0a3ef515a (patch) | |
| tree | e66986c0fe445a51259f302a2eb951432f9cb3c1 | |
| parent | 80cde8dc7cebb17e7ebe6317c60480e3f9055e92 (diff) | |
fix openjpeg test so it can be cached, speeding up the test runner
| -rw-r--r-- | tests/openjpeg/opj_config.h | 22 | ||||
| -rw-r--r-- | tests/runner.py | 5 |
2 files changed, 25 insertions, 2 deletions
diff --git a/tests/openjpeg/opj_config.h b/tests/openjpeg/opj_config.h new file mode 100644 index 00000000..1996a415 --- /dev/null +++ b/tests/openjpeg/opj_config.h @@ -0,0 +1,22 @@ +/* create config.h for CMake */ +#define PACKAGE_VERSION "1.4.0" +# +#define HAVE_INTTYPES_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_LIBPNG 1 +#define HAVE_PNG_H 1 +#define HAVE_LIBTIFF 1 +#define HAVE_TIFF_H 1 +# +/* #undef HAVE_LIBLCMS1 */ +/* #undef HAVE_LIBLCMS2 */ +/* #undef HAVE_LCMS1_H */ +/* #undef HAVE_LCMS2_H */ +# diff --git a/tests/runner.py b/tests/runner.py index 44136b16..f3a675b8 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -3806,6 +3806,8 @@ at function.:blag ) open(filename, 'w').write(src) + shutil.copy(path_from_root('tests', 'openjpeg', 'opj_config.h'), self.get_dir()) + lib = self.get_library('openjpeg', [os.path.join('bin', 'libopenjpeg.so.1.4.0.bc'), os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/index.c.o'.split('/')), @@ -3814,8 +3816,7 @@ at function.:blag os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/__/common/getopt.c.o'.split('/'))], configure=['cmake', '.'], #configure_args=['--enable-tiff=no', '--enable-jp3d=no', '--enable-png=no'], - make_args=[], # no -j 2, since parallel builds can fail - cache=False) # We need opj_config.h and other generated files, so cannot cache just the .bc + make_args=[]) # no -j 2, since parallel builds can fail # We use doubles in JS, so we get slightly different values than native code. So we # check our output by comparing the average pixel difference |