mirror of https://gitee.com/openkylin/libvirt.git
rename tests/conftest.c
To prevent confusion with configure's popular name for a file, rename conftest.c to test_conf.c which is consistent with the invoking test_conf.sh Signed-off-by: Gene Czarcinski <gene@czarc.net>
This commit is contained in:
parent
57f39e03ff
commit
1cd2078c88
|
@ -172,6 +172,7 @@
|
|||
/tests/statstest
|
||||
/tests/storagebackendsheepdogtest
|
||||
/tests/sysinfotest
|
||||
/tests/test_conf
|
||||
/tests/utiltest
|
||||
/tests/viratomictest
|
||||
/tests/virauthconfigtest
|
||||
|
|
|
@ -88,7 +88,7 @@ EXTRA_DIST = \
|
|||
xml2vmxdata \
|
||||
.valgrind.supp
|
||||
|
||||
test_helpers = commandhelper ssh conftest
|
||||
test_helpers = commandhelper ssh test_conf
|
||||
test_programs = virshtest sockettest \
|
||||
nodeinfotest virbuftest \
|
||||
commandtest seclabeltest \
|
||||
|
@ -507,9 +507,9 @@ virshtest_SOURCES = \
|
|||
testutils.c testutils.h
|
||||
virshtest_LDADD = $(LDADDS)
|
||||
|
||||
conftest_SOURCES = \
|
||||
conftest.c
|
||||
conftest_LDADD = $(LDADDS)
|
||||
test_conf_SOURCES = \
|
||||
test_conf.c
|
||||
test_conf_LDADD = $(LDADDS)
|
||||
|
||||
nodeinfotest_SOURCES = \
|
||||
nodeinfotest.c testutils.h testutils.c
|
||||
|
|
|
@ -12,7 +12,7 @@ data_dir=$abs_srcdir/confdata
|
|||
for f in $(cd "$data_dir" && echo *.conf)
|
||||
do
|
||||
i=`expr $i + 1`
|
||||
"$abs_builddir/conftest" "$data_dir/$f" > "$f-actual"
|
||||
"$abs_builddir/test_conf" "$data_dir/$f" > "$f-actual"
|
||||
expected="$data_dir"/`echo "$f" | sed s+\.conf$+\.out+`
|
||||
if compare "$expected" "$f-actual"; then
|
||||
ret=0
|
||||
|
|
Loading…
Reference in New Issue