[ovs-dev] [ovs-dev 3/3] ovs-dev.py: Support running the clang binaries.

[Daniele Di Proietto]

Acked-by: Daniele Di Proietto <ddiproietto at vmware.com>

On 9/5/14, 2:20 PM, "Ethan Jackson" <ethan at nicira.com> wrote:

>They have slightly different support characteristics, so it's nice to
>easily switch between them for testing.
>
>Signed-off-by: Ethan Jackson <ethan at nicira.com>
>---
> utilities/ovs-dev.py | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
>diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
>index 3686391..491d5ff 100755
>--- a/utilities/ovs-dev.py
>+++ b/utilities/ovs-dev.py
>@@ -26,14 +26,15 @@ OVS_SRC = HOME + "/ovs"
> ROOT = HOME + "/root"
> BUILD_GCC = OVS_SRC + "/_build-gcc"
> BUILD_CLANG = OVS_SRC + "/_build-clang"
>-PATH = "%(ovs)s/utilities:%(ovs)s/ovsdb:%(ovs)s/vswitchd" % {"ovs":
>BUILD_GCC}
>-
>-ENV["PATH"] = PATH + ":" + ENV["PATH"]
> 
> options = None
> parser = None
> commands = []
> 
>+def set_path(build):
>+    PATH = "%(ovs)s/utilities:%(ovs)s/ovsdb:%(ovs)s/vswitchd" % {"ovs":
>build}
>+
>+    ENV["PATH"] = PATH + ":" + ENV["PATH"]
> 
> def _sh(*args, **kwargs):
>     print "------> " + " ".join(args)
>@@ -236,7 +237,8 @@ def run():
>     _sh("ovs-vsctl --no-wait set Open_vSwitch %s ovs_version=%s"
>         % (root_uuid, version))
> 
>-    cmd = [BUILD_GCC + "/vswitchd/ovs-vswitchd"]
>+    build = BUILD_CLANG if options.clang else BUILD_GCC
>+    cmd = [build + "/vswitchd/ovs-vswitchd"]
> 
>     if options.dpdk:
>         cmd.append("--dpdk")
>@@ -387,6 +389,9 @@ def main():
>     group.add_option("--dpdk", dest="dpdk", action="callback",
>                      callback=parse_subargs,
>                      help="run ovs-vswitchd with dpdk subopts (ended by
>--)")
>+    group.add_option("--clang", dest="clang", action="store_true",
>+                     help="Use binaries built by clang")
>+
>     parser.add_option_group(group)
> 
>     options, args = parser.parse_args()
>@@ -396,6 +401,11 @@ def main():
>             print "Unknown argument " + arg
>             doc()
> 
>+    if options.clang:
>+        set_path(BUILD_CLANG)
>+    else:
>+        set_path(BUILD_GCC)
>+
>     try:
>         os.chdir(OVS_SRC)
>     except OSError:
>-- 
>1.8.1.2
>
>_______________________________________________
>dev mailing list
>dev at openvswitch.org
>https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/mailman/
>listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=MV9BdLjtFIdhBDBaw5z%2BU
>6SSA2gAfY4L%2F1HCy3VjlKU%3D%0A&m=D%2FrGDCOm24uBvYVq2tXn8LwIN9H187zd7GpQcDS
>9vKc%3D%0A&s=de9c0d51a55919903f0c536d533f473562425766d1c0f9cf56de7f69bd044
>c4e