From 51a1ed0a8b0f747013e143634476498ab536b423 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 14 Dec 2012 13:06:13 -0300
Subject: [PATCH] --- yaml --- r: 349922 b: refs/heads/master c:
 54359d3340241b4cf53e42ecd5c429d7ba6fbef3 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/tools/perf/Makefile             |  4 ++++
 trunk/tools/perf/tests/builtin-test.c |  4 ++++
 trunk/tools/perf/tests/python-use.c   | 23 +++++++++++++++++++++++
 trunk/tools/perf/tests/tests.h        |  1 +
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 trunk/tools/perf/tests/python-use.c

diff --git a/[refs] b/[refs]
index 2f51d6e2eb1a..a1d536b5309d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56e52e85366717481cde16b3480f015c7eb32ba3
+refs/heads/master: 54359d3340241b4cf53e42ecd5c429d7ba6fbef3
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index c9f72b18e787..d0d79574403a 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -488,6 +488,7 @@ LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o
 LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o
 LIB_OBJS += $(OUTPUT)tests/pmu.o
 LIB_OBJS += $(OUTPUT)tests/hists_link.o
+LIB_OBJS += $(OUTPUT)tests/python-use.o
 
 BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
 BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
@@ -955,6 +956,9 @@ $(OUTPUT)tests/attr.o: tests/attr.c $(OUTPUT)PERF-CFLAGS
 		'-DBINDIR="$(bindir_SQ)"' \
 		$<
 
+$(OUTPUT)tests/python-use.o: tests/python-use.c $(OUTPUT)PERF-CFLAGS
+	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DPYTHONPATH='"$(OUTPUT)/python"' $<
+
 $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS
 	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
 
diff --git a/trunk/tools/perf/tests/builtin-test.c b/trunk/tools/perf/tests/builtin-test.c
index 479d10484a74..a164e4cd5f42 100644
--- a/trunk/tools/perf/tests/builtin-test.c
+++ b/trunk/tools/perf/tests/builtin-test.c
@@ -72,6 +72,10 @@ static struct test {
 		.desc = "Test matching and linking mutliple hists",
 		.func = test__hists_link,
 	},
+	{
+		.desc = "Try 'use perf' in python, checking link problems",
+		.func = test__python_use,
+	},
 	{
 		.func = NULL,
 	},
diff --git a/trunk/tools/perf/tests/python-use.c b/trunk/tools/perf/tests/python-use.c
new file mode 100644
index 000000000000..15301f4ac3f1
--- /dev/null
+++ b/trunk/tools/perf/tests/python-use.c
@@ -0,0 +1,23 @@
+/*
+ * Just test if we can load the python binding.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "tests.h"
+
+extern int verbose;
+
+int test__python_use(void)
+{
+	char *cmd;
+	int ret;
+
+	if (asprintf(&cmd, "echo \"import sys ; sys.path.append('%s'); import perf\" | python %s",
+		     PYTHONPATH, verbose ? "" : "2> /dev/null") < 0)
+		return -1;
+
+	ret = system(cmd) ? -1 : 0;
+	free(cmd);
+	return ret;
+}
diff --git a/trunk/tools/perf/tests/tests.h b/trunk/tools/perf/tests/tests.h
index 0bf106978094..0ded425b17d6 100644
--- a/trunk/tools/perf/tests/tests.h
+++ b/trunk/tools/perf/tests/tests.h
@@ -16,5 +16,6 @@ int test__attr(void);
 int test__dso_data(void);
 int test__parse_events(void);
 int test__hists_link(void);
+int test__python_use(void);
 
 #endif /* TESTS_H */