diff options
| author | Ilya Maximets <i.maximets@samsung.com> | 2016-01-29 12:20:13 +0300 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-01-29 07:46:24 -0500 |
| commit | 72eaa2baa910ba41ed29b56617bffbc46bafc342 (patch) | |
| tree | 4b6dcbda12eb4f000bd7f8383cfee84baafe7981 | |
| parent | 5494063acb1036ff92d3a63b16381256bc0174df (diff) | |
| download | openvswitch-72eaa2baa910ba41ed29b56617bffbc46bafc342.tar.gz | |
ovn: Remove top ovn directory from PATHs.
Since 5b5c922b0ca6 ("ovn-nbctl: Move ovn-nbctl to utilities directory.")
there is no more executables in top ovn directory.
Removing of this directory from PATHs helps to avoid problems when
old executable ./ovn/ovn-nbctl used instead of ./ovn/utilities/ovn-nbctl.
This may happen if source directory was updated to commit 5b5c922b0ca6
without calling 'make clean'.
Fixes: 5b5c922b0ca6 ("ovn-nbctl: Move ovn-nbctl to utilities directory.")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Russell Bryant <russell@ovn.org>
| -rw-r--r-- | tests/automake.mk | 2 | ||||
| -rwxr-xr-x | tutorial/ovs-sandbox | 2 | ||||
| -rwxr-xr-x | utilities/ovs-sim.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/automake.mk b/tests/automake.mk index 28078c097..4109052a9 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -112,7 +112,7 @@ SYSTEM_KMOD_TESTSUITE = $(srcdir)/tests/system-kmod-testsuite SYSTEM_USERSPACE_TESTSUITE = $(srcdir)/tests/system-userspace-testsuite DISTCLEANFILES += tests/atconfig tests/atlocal -AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR_DLL):ovn:ovn/controller-vtep:ovn/northd:ovn/utilities:ovn/controller +AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR_DLL):ovn/controller-vtep:ovn/northd:ovn/utilities:ovn/controller check-local: tests/atconfig tests/atlocal $(TESTSUITE) $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index a2e9f7a8c..ea3b827fe 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -260,7 +260,7 @@ if $built; then fi PATH=$builddir/ovsdb:$builddir/vswitchd:$builddir/utilities:$builddir/vtep:$PATH if $ovn; then - PATH=$builddir/ovn:$builddir/ovn/controller:$builddir/ovn/controller-vtep:$builddir/ovn/northd:$builddir/ovn/utilities:$PATH + PATH=$builddir/ovn/controller:$builddir/ovn/controller-vtep:$builddir/ovn/northd:$builddir/ovn/utilities:$PATH fi export PATH else diff --git a/utilities/ovs-sim.in b/utilities/ovs-sim.in index 1702f0ef4..cebbd419c 100755 --- a/utilities/ovs-sim.in +++ b/utilities/ovs-sim.in @@ -70,7 +70,7 @@ fi # Put built tools early in $PATH. PATH=$sim_builddir/ovsdb:$sim_builddir/vswitchd:$sim_builddir/utilities:$PATH -PATH=$sim_builddir/ovn:$sim_srcdir/ovn:$sim_builddir/ovn/controller:$sim_builddir/ovn/northd:$sim_builddir/ovn/utilities:$PATH +PATH=$sim_builddir/ovn/controller:$sim_builddir/ovn/northd:$sim_builddir/ovn/utilities:$PATH export PATH rm -rf sandbox |