octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

Add QPDF_ to some variables used by the test suite 

LARGE_FILE_TEST_PATH -> QPDF_LARGE_FILE_TEST_PATH
SKIP_TEST_COMPARE_IMAGES -> QPDF_SKIP_TEST_COMPARE_IMAGES
This commit is contained in:
Jay Berkenbilt 2012-07-28 19:06:03 -04:00
parent d2e8bae6a4
commit 5878d17f0d
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -81,8 +81,8 @@ CLEAN_TARGETS = $(foreach B,$(BUILD_ITEMS),clean_$(B))
# For test suitse # For test suitse
export QPDF_BIN = $(abspath qpdf/$(OUTPUT_DIR)/qpdf) export QPDF_BIN = $(abspath qpdf/$(OUTPUT_DIR)/qpdf)
export SKIP_TEST_COMPARE_IMAGES export QPDF_SKIP_TEST_COMPARE_IMAGES
export LARGE_FILE_TEST_PATH export QPDF_LARGE_FILE_TEST_PATH
clean:: $(CLEAN_TARGETS) clean:: $(CLEAN_TARGETS)

4
autoconf.mk.in
View File

@ -32,10 +32,10 @@ XMLLINT=@XMLLINT@
BUILD_HTML=@BUILD_HTML@ BUILD_HTML=@BUILD_HTML@
BUILD_PDF=@BUILD_PDF@ BUILD_PDF=@BUILD_PDF@
VALIDATE_DOC=@VALIDATE_DOC@ VALIDATE_DOC=@VALIDATE_DOC@
SKIP_TEST_COMPARE_IMAGES=@SKIP_TEST_COMPARE_IMAGES@ QPDF_SKIP_TEST_COMPARE_IMAGES=@QPDF_SKIP_TEST_COMPARE_IMAGES@
BUILDRULES=@BUILDRULES@ BUILDRULES=@BUILDRULES@
HAVE_LD_VERSION_SCRIPT=@HAVE_LD_VERSION_SCRIPT@ HAVE_LD_VERSION_SCRIPT=@HAVE_LD_VERSION_SCRIPT@
WINDOWS_WORDSIZE=@WINDOWS_WORDSIZE@ WINDOWS_WORDSIZE=@WINDOWS_WORDSIZE@
SHOW_FAILED_TEST_OUTPUT=@SHOW_FAILED_TEST_OUTPUT@ SHOW_FAILED_TEST_OUTPUT=@SHOW_FAILED_TEST_OUTPUT@
# Allow environment variable to override # Allow environment variable to override
LARGE_FILE_TEST_PATH?=@LARGE_FILE_TEST_PATH@ QPDF_LARGE_FILE_TEST_PATH?=@QPDF_LARGE_FILE_TEST_PATH@

18
configure.ac
View File

@ -54,13 +54,13 @@ if test "$BUILD_INTERNAL_LIBS" = "0"; then
AC_SEARCH_LIBS(pcre_compile,pcre,,[MISSING_PCRE=1; MISSING_ANY=1]) AC_SEARCH_LIBS(pcre_compile,pcre,,[MISSING_PCRE=1; MISSING_ANY=1])
fi fi
LARGE_FILE_TEST_PATH= QPDF_LARGE_FILE_TEST_PATH=
AC_SUBST(LARGE_FILE_TEST_PATH) AC_SUBST(QPDF_LARGE_FILE_TEST_PATH)
AC_ARG_WITH(large-file-test-path, AC_ARG_WITH(large-file-test-path,
AS_HELP_STRING([--with-large-file-test-path=path], AS_HELP_STRING([--with-large-file-test-path=path],
[To enable testing of files > 4GB, give the path to a directory with at least 11 GB free. The test suite will write temporary files to this directory. Alternatively, just set the LARGE_FILE_TEST_PATH environment variable to the path before running the test suite.]), [To enable testing of files > 4GB, give the path to a directory with at least 11 GB free. The test suite will write temporary files to this directory. Alternatively, just set the QPDF_LARGE_FILE_TEST_PATH environment variable to the path before running the test suite.]),
[LARGE_FILE_TEST_PATH=$withval], [QPDF_LARGE_FILE_TEST_PATH=$withval],
[LARGE_FILE_TEST_PATH=]) [QPDF_LARGE_FILE_TEST_PATH=])
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_FUNC_FSEEKO AC_FUNC_FSEEKO
@ -210,16 +210,16 @@ if test "$BUILDRULES" != "msvc"; then
fi fi
fi fi
AC_SUBST(SKIP_TEST_COMPARE_IMAGES) AC_SUBST(QPDF_SKIP_TEST_COMPARE_IMAGES)
AC_ARG_ENABLE(test-compare-images, AC_ARG_ENABLE(test-compare-images,
AS_HELP_STRING([--enable-test-compare-images], AS_HELP_STRING([--enable-test-compare-images],
[whether to compare images in test suite; disabled by default, enabling requires ghostscript and tiffcmp to be available]), [whether to compare images in test suite; disabled by default, enabling requires ghostscript and tiffcmp to be available]),
[if test "$enableval" = "no"; then [if test "$enableval" = "no"; then
SKIP_TEST_COMPARE_IMAGES=1 QPDF_SKIP_TEST_COMPARE_IMAGES=1
else else
SKIP_TEST_COMPARE_IMAGES=0 QPDF_SKIP_TEST_COMPARE_IMAGES=0
fi], fi],
[SKIP_TEST_COMPARE_IMAGES=1]) [QPDF_SKIP_TEST_COMPARE_IMAGES=1])
AC_SUBST(SHOW_FAILED_TEST_OUTPUT) AC_SUBST(SHOW_FAILED_TEST_OUTPUT)
AC_ARG_ENABLE(show-failed-test-output, AC_ARG_ENABLE(show-failed-test-output,

6
qpdf/qtest/qpdf.test
View File

@ -16,12 +16,12 @@ cleanup();
my $td = new TestDriver('qpdf'); my $td = new TestDriver('qpdf');
my $compare_images = 1; my $compare_images = 1;
if ((exists $ENV{'SKIP_TEST_COMPARE_IMAGES'}) && if ((exists $ENV{'QPDF_SKIP_TEST_COMPARE_IMAGES'}) &&
($ENV{'SKIP_TEST_COMPARE_IMAGES'} eq '1')) ($ENV{'QPDF_SKIP_TEST_COMPARE_IMAGES'} eq '1'))
{ {
$compare_images = 0; $compare_images = 0;
} }
my $large_file_test_path = $ENV{'LARGE_FILE_TEST_PATH'} || undef; my $large_file_test_path = $ENV{'QPDF_LARGE_FILE_TEST_PATH'} || undef;
my $have_acroread = 0; my $have_acroread = 0;