diff --git a/.gitignore b/.gitignore index abfaaf311..d5c674211 100644 --- a/.gitignore +++ b/.gitignore @@ -576,6 +576,5 @@ Makefile.in /v2v/test-harness/dllv2v_test_harness.so /v2v/test-harness/stamp-virt-v2v-test-harness.pod /v2v/test-harness/virt-v2v-test-harness.1 -/v2v/test-v2v-networks-and-bridges.xml /v2v/virt-v2v /v2v/virt-v2v.1 diff --git a/configure.ac b/configure.ac index 11c9c677b..9548a8a5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1836,7 +1836,6 @@ AC_CONFIG_FILES([Makefile tests/xml/Makefile tools/Makefile v2v/Makefile - v2v/test-v2v-networks-and-bridges.xml v2v/test-harness/Makefile v2v/test-harness/META]) AC_OUTPUT diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 5efb7fb8f..a5b081d92 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST = \ test-v2v-i-ova-two-disks.expected \ test-v2v-i-ova-two-disks.ovf \ test-v2v-networks-and-bridges-expected.xml \ - test-v2v-networks-and-bridges.xml.in \ + test-v2v-networks-and-bridges.xml \ virt-v2v.pod CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-v2v @@ -247,11 +247,6 @@ TESTS += \ test-v2v-windows-conversion.sh endif ENABLE_APPLIANCE -# This forces the file to be updated before running the tests, in case -# the .xml.in file has been changed. Be nice if automake just did the -# right thing here. -check_DATA = test-v2v-networks-and-bridges.xml - check-valgrind: $(MAKE) VG="$(top_builddir)/run @VG@" check diff --git a/v2v/test-v2v-networks-and-bridges.xml.in b/v2v/test-v2v-networks-and-bridges.xml similarity index 96% rename from v2v/test-v2v-networks-and-bridges.xml.in rename to v2v/test-v2v-networks-and-bridges.xml index 39116e3ab..a6409f80f 100644 --- a/v2v/test-v2v-networks-and-bridges.xml.in +++ b/v2v/test-v2v-networks-and-bridges.xml @@ -15,8 +15,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -@configure_input@ --> @@ -29,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - +