summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinux_geek <taseer94@gmail.com>2016-11-03 20:35:58 +0500
committerlinux_geek <taseer94@gmail.com>2016-11-06 07:43:30 +0500
commit2f650cc150e966781e971cace1762b71fc320f75 (patch)
tree06b13e2c9771575729e82b2bb8b7062ecf19aa66
parente831e0b5e918200e98e8abe8d10a46c7873e6128 (diff)
Directory independant 'perftest list' command execution.
JIRA: QTIP-141 Change-Id: I5a4fce5d8b13c9443bc1be13cb174a78a262e8b6 Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
-rw-r--r--cli/commands/perftest.py4
-rw-r--r--cli/helper.py14
2 files changed, 17 insertions, 1 deletions
diff --git a/cli/commands/perftest.py b/cli/commands/perftest.py
index c163070a..0eb6d062 100644
--- a/cli/commands/perftest.py
+++ b/cli/commands/perftest.py
@@ -10,12 +10,14 @@
from prettytable import PrettyTable
import yaml
import click
+import os
+from cli import helper
class PerfTest:
def __init__(self):
- self.path = 'benchmarks/perftest/summary'
+ self.path = os.path.join(helper.fetch_root(), 'perftest/summary')
def list(self):
table = PrettyTable(["Name", "Description"])
diff --git a/cli/helper.py b/cli/helper.py
new file mode 100644
index 00000000..a5865bce
--- /dev/null
+++ b/cli/helper.py
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2016 ZTE Corp and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+import os
+
+
+def fetch_root():
+ return os.path.join(os.path.dirname(__file__), os.pardir, 'benchmarks/')
background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
From c31749157aabca758ef731ad4d15ddf4cc2efe66 Mon Sep 17 00:00:00 2001
From: Romanos Skiadas <rski@intracom-telecom.com>
Date: Mon, 6 Feb 2017 15:28:44 +0200
Subject: [PATCH] lib: Include missing ccapnproto header in Makefile

Without this make dist doesn't include the header and the resulting
archive doesn't build.

Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
---
 lib/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c286833..c7682ed 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -43,6 +43,7 @@ endif
 if HAVE_CCAPNPROTO
 libzebra_la_SOURCES += qzc.capnp.c
 BUILT_SOURCES += qzc.capnp.c
+pkginclude_HEADERS += qzc.capnp.h
 endif
 
 EXTRA_DIST = \
-- 
1.8.3.1