OpenSystemsDevelopment / qpdf

Commit 5878d17f0d07737f7130f71f4a26682a1f2318fa

Authored by Jay Berkenbilt
1 parent d2e8bae6

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
Inline Side-by-side
Showing 4 changed files with 16 additions and 16 deletions
Makefile
  View file @5878d17
... ... @@ -81,8 +81,8 @@ CLEAN_TARGETS = $(foreach B,$(BUILD_ITEMS),clean_$(B))
81 81  
82 82 # For test suitse
83 83 export QPDF_BIN = $(abspath qpdf/$(OUTPUT_DIR)/qpdf)
84   -export SKIP_TEST_COMPARE_IMAGES
85   -export LARGE_FILE_TEST_PATH
  84 +export QPDF_SKIP_TEST_COMPARE_IMAGES
  85 +export QPDF_LARGE_FILE_TEST_PATH
86 86  
87 87 clean:: $(CLEAN_TARGETS)
88 88  
... ...
autoconf.mk.in
  View file @5878d17
... ... @@ -32,10 +32,10 @@ XMLLINT=@XMLLINT@
32 32 BUILD_HTML=@BUILD_HTML@
33 33 BUILD_PDF=@BUILD_PDF@
34 34 VALIDATE_DOC=@VALIDATE_DOC@
35   -SKIP_TEST_COMPARE_IMAGES=@SKIP_TEST_COMPARE_IMAGES@
  35 +QPDF_SKIP_TEST_COMPARE_IMAGES=@QPDF_SKIP_TEST_COMPARE_IMAGES@
36 36 BUILDRULES=@BUILDRULES@
37 37 HAVE_LD_VERSION_SCRIPT=@HAVE_LD_VERSION_SCRIPT@
38 38 WINDOWS_WORDSIZE=@WINDOWS_WORDSIZE@
39 39 SHOW_FAILED_TEST_OUTPUT=@SHOW_FAILED_TEST_OUTPUT@
40 40 # Allow environment variable to override
41   -LARGE_FILE_TEST_PATH?=@LARGE_FILE_TEST_PATH@
  41 +QPDF_LARGE_FILE_TEST_PATH?=@QPDF_LARGE_FILE_TEST_PATH@
... ...
configure.ac
  View file @5878d17
... ... @@ -54,13 +54,13 @@ if test "$BUILD_INTERNAL_LIBS" = "0"; then
54 54 AC_SEARCH_LIBS(pcre_compile,pcre,,[MISSING_PCRE=1; MISSING_ANY=1])
55 55 fi
56 56  
57   -LARGE_FILE_TEST_PATH=
58   -AC_SUBST(LARGE_FILE_TEST_PATH)
  57 +QPDF_LARGE_FILE_TEST_PATH=
  58 +AC_SUBST(QPDF_LARGE_FILE_TEST_PATH)
59 59 AC_ARG_WITH(large-file-test-path,
60 60 AS_HELP_STRING([--with-large-file-test-path=path],
61   - [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.]),
62   - [LARGE_FILE_TEST_PATH=$withval],
63   - [LARGE_FILE_TEST_PATH=])
  61 + [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.]),
  62 + [QPDF_LARGE_FILE_TEST_PATH=$withval],
  63 + [QPDF_LARGE_FILE_TEST_PATH=])
64 64  
65 65 AC_SYS_LARGEFILE
66 66 AC_FUNC_FSEEKO
... ... @@ -210,16 +210,16 @@ if test "$BUILDRULES" != "msvc"; then
210 210 fi
211 211 fi
212 212  
213   -AC_SUBST(SKIP_TEST_COMPARE_IMAGES)
  213 +AC_SUBST(QPDF_SKIP_TEST_COMPARE_IMAGES)
214 214 AC_ARG_ENABLE(test-compare-images,
215 215 AS_HELP_STRING([--enable-test-compare-images],
216 216 [whether to compare images in test suite; disabled by default, enabling requires ghostscript and tiffcmp to be available]),
217 217 [if test "$enableval" = "no"; then
218   - SKIP_TEST_COMPARE_IMAGES=1
  218 + QPDF_SKIP_TEST_COMPARE_IMAGES=1
219 219 else
220   - SKIP_TEST_COMPARE_IMAGES=0
  220 + QPDF_SKIP_TEST_COMPARE_IMAGES=0
221 221 fi],
222   - [SKIP_TEST_COMPARE_IMAGES=1])
  222 + [QPDF_SKIP_TEST_COMPARE_IMAGES=1])
223 223  
224 224 AC_SUBST(SHOW_FAILED_TEST_OUTPUT)
225 225 AC_ARG_ENABLE(show-failed-test-output,
... ...
qpdf/qtest/qpdf.test
  View file @5878d17
... ... @@ -16,12 +16,12 @@ cleanup();
16 16 my $td = new TestDriver('qpdf');
17 17  
18 18 my $compare_images = 1;
19   -if ((exists $ENV{'SKIP_TEST_COMPARE_IMAGES'}) &&
20   - ($ENV{'SKIP_TEST_COMPARE_IMAGES'} eq '1'))
  19 +if ((exists $ENV{'QPDF_SKIP_TEST_COMPARE_IMAGES'}) &&
  20 + ($ENV{'QPDF_SKIP_TEST_COMPARE_IMAGES'} eq '1'))
21 21 {
22 22 $compare_images = 0;
23 23 }
24   -my $large_file_test_path = $ENV{'LARGE_FILE_TEST_PATH'} || undef;
  24 +my $large_file_test_path = $ENV{'QPDF_LARGE_FILE_TEST_PATH'} || undef;
25 25  
26 26 my $have_acroread = 0;
27 27  
... ...