bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only set up LD_PRELOAD for tests that actually need it.

Browse Source
This commit is contained in:
Patrick J Cherry
2018-02-07 22:05:07 +00:00
parent 79181b3153
commit f71b872622
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -85,8 +85,7 @@ check: $(OBJS) $(CHECK_BINS)
r=true ; for bin in $(CHECK_BINS); do $$bin || r=false; done ; $$r r=true ; for bin in $(CHECK_BINS); do $$bin || r=false; done ; $$r
acceptance: build acceptance: build
$(MAKE) -C tests/acceptance/ld_preloads all cd tests/acceptance && RUBYOPT='-I.' ruby nbd_scenarios -v
cd tests/acceptance && LD_PRELOADS=$$(echo ld_preloads/*.o) RUBYOPT='-I.' ruby nbd_scenarios -v
test: check acceptance test: check acceptance
@@ -109,8 +108,6 @@ install:
clean: clean:
rm -rf build/* rm -rf build/*
$(RM) $(LD_PRELOAD_OBJ)
.PHONY: clean objs check_objs all server proxy check_bins check doc build test acceptance .PHONY: clean objs check_objs all server proxy check_bins check doc build test acceptance

11
tests/acceptance/test_serve_mode.rb
View File

@@ -40,10 +40,17 @@ class TestServeMode < Test::Unit::TestCase
end end
def setup_msync_catcher def setup_msync_catcher
`make -C ld_preloads/ msync_catcher.o`
omit 'LD_PRELOAD library not found' unless
File.exist?('ld_preloads/msync_catcher.o')
@msync_catcher = Tempfile.new('msync') @msync_catcher = Tempfile.new('msync')
ENV['MSYNC_CATCHER_OUTPUT'] = @msync_catcher.path ENV['MSYNC_CATCHER_OUTPUT'] = @msync_catcher.path
@ld_preload_orig = ENV['LD_PRELOAD']
ENV['LD_PRELOAD'] = 'ld_preloads/msync_catcher.o'
end end
def parse_msync_output def parse_msync_output
op = [] op = []
until @msync_catcher.eof? until @msync_catcher.eof?
@@ -56,7 +63,9 @@ class TestServeMode < Test::Unit::TestCase
def teardown_msync_catcher def teardown_msync_catcher
@msync_catcher.close if @msync_catcher @msync_catcher.close if @msync_catcher
ENV.delete 'MSYNC_CATCHER_OUTPUT' ENV.delete 'MSYNC_CATCHER_OUTPUT'
ENV['LD_PRELOAD'] = @ld_preload_orig
end end
def test_bad_request_magic_receives_error_response def test_bad_request_magic_receives_error_response