提交 e7f16ddc 编写于 作者: M Michal Privoznik

tests: Make check-file-access.pl accept files through argv

The script needs two files to open:

  $(builddir)/test_file_access.txt, and
  $(srcdir)/file_access_whitelist.txt.

However, the script is opening the files from the $CWD which
won't work for a VPATH build. Make the script accept paths to the
files through @ARGV and tune the Makefile.am to pass them.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 504f8319
...@@ -454,7 +454,9 @@ EXTRA_DIST += $(test_scripts) ...@@ -454,7 +454,9 @@ EXTRA_DIST += $(test_scripts)
if WITH_LINUX if WITH_LINUX
check-access: file-access-clean check-access: file-access-clean
VIR_TEST_FILE_ACCESS=1 $(MAKE) $(AM_MAKEFLAGS) check VIR_TEST_FILE_ACCESS=1 $(MAKE) $(AM_MAKEFLAGS) check
$(PERL) check-file-access.pl | sort -u $(PERL) $(abs_srcdir)/check-file-access.pl \
$(abs_builddir)/test_file_access.txt \
$(abs_srcdir)/file_access_whitelist.txt | sort -u
file-access-clean: file-access-clean:
> test_file_access.txt > test_file_access.txt
......
...@@ -24,8 +24,12 @@ ...@@ -24,8 +24,12 @@
use strict; use strict;
use warnings; use warnings;
my $access_file = "test_file_access.txt"; sub usage {
my $whitelist_file = "file_access_whitelist.txt"; die "$0 access_file file_access_whitelist\n";
}
my $access_file = shift or usage();
my $whitelist_file = shift or usage();
my @known_actions = ("open", "fopen", "access", "stat", "lstat", "connect"); my @known_actions = ("open", "fopen", "access", "stat", "lstat", "connect");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册