diff options
| author | Ethan Jackson <ethan@nicira.com> | 2014-09-05 14:18:27 -0700 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2014-09-16 21:35:01 -0700 |
| commit | 97695cf7e677a0ccace2904b252e40924f18d9ac (patch) | |
| tree | 99a2095d7f51c22344ca2e72f33a176ea75cc8a2 | |
| parent | 1bcf46c62e6db4786d667b495a979381eb40680e (diff) | |
| download | openvswitch-97695cf7e677a0ccace2904b252e40924f18d9ac.tar.gz | |
ovs-dev.py: Support running the clang binaries.
They have slightly different support characteristics, so it's nice to
easily switch between them for testing.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Daniele Di Proietto <ddiproietto@vmware.com>
| -rwxr-xr-x | utilities/ovs-dev.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py index e1cc4c136..869d89e81 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: |