aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-07-14 11:34:11 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-07-14 11:34:11 -0700
commit689a90a987a61451410ce5719a23ef32924abd53 (patch)
tree072e0796f616ef558f8b114a2061ec7292d92060 /tests
parent9234eaa52fa25cb7d6f6b44a2e695380c1b35d9a (diff)
fix test_poppler
Diffstat (limited to 'tests')
-rwxr-xr-xtests/runner.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py
index d10a7c40..595e4ff2 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -296,7 +296,7 @@ process(sys.argv[1])
os.makedirs(ret)
return ret
- def get_library(self, name, generated_libs, configure=['sh', './configure'], configure_args=[], make=['make'], make_args=['-j', '2'], cache=True):
+ def get_library(self, name, generated_libs, configure=['sh', './configure'], configure_args=[], make=['make'], make_args=['-j', '2'], cache=True, env_init={}):
build_dir = self.get_build_dir()
output_dir = self.get_dir()
@@ -316,7 +316,7 @@ process(sys.argv[1])
print >> sys.stderr, '<building and saving into cache> ',
return Building.build_library(name, build_dir, output_dir, generated_libs, configure, configure_args, make, make_args, self.library_cache, cache_name,
- copy_project=True)
+ copy_project=True, env_init=env_init)
def clear(self):
for name in os.listdir(self.get_dir()):
@@ -5274,6 +5274,7 @@ def process(filename):
[os.path.join('utils', 'pdftoppm.o'),
os.path.join('utils', 'parseargs.o'),
os.path.join('poppler', '.libs', 'libpoppler.a')],
+ env_init={ 'FONTCONFIG_CFLAGS': ' ', 'FONTCONFIG_LIBS': ' ' },
configure_args=['--disable-libjpeg', '--disable-libpng', '--disable-poppler-qt', '--disable-poppler-qt4', '--disable-cms', '--disable-cairo-output', '--disable-abiword-output', '--enable-shared=no'])
# Combine libraries