summaryrefslogtreecommitdiffstats
path: root/meta/recipes-rt/rt-tests
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2014-04-24 17:09:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-11 12:27:22 +0100
commit47013aa9773e5f1a7d02b5e8dd485d1166cf7203 (patch)
tree38ed02749fe232f3c5c74774873e7a76d5c3c909 /meta/recipes-rt/rt-tests
parentebaf77dc730d2fdc58c06c16adf0f9ce474dbffc (diff)
downloadpoky-47013aa9773e5f1a7d02b5e8dd485d1166cf7203.tar.gz
rt-tests: bump version 0.87 => 0.89
cyclictest was updated to correct some problems with CPU affinity selection and display of help and/or execution details. These patches were accepted by the maintainer of the cyclictest utility. The changes were reflected in an updated release of rt-tests - v0.89 The cyclictest changes were successfully tested on both an ARM v7 and x86_64 host environment. The OE recipe was updated locally to incorporate the newer rt-tests release and the resulting builds were verified for the same ARM v7 target and for qemux86. Patch files obsoleted by the rt-tests 0.89 release were removed from the recipe deleted: meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch deleted: meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch deleted: meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch (From OE-Core rev: 7996ca20c24157aee259bfa88b6d7743511d5eff) Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-rt/rt-tests')
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch35
-rw-r--r--meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch68
-rw-r--r--meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch50
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests.inc7
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests_0.89.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_0.87.bb)0
5 files changed, 2 insertions, 158 deletions
diff --git a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch b/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch
deleted file mode 100644
index 8b493eb1f1..0000000000
--- a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 66765522b634952346f1a3ab7d00c7222a1f9361 Mon Sep 17 00:00:00 2001
2Message-Id: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
3From: Darren Hart <dvhart@linux.intel.com>
4Date: Tue, 11 Sep 2012 15:19:30 -0700
5Subject: [PATCH 1/2] rt-tests: Allow for user-specified PYLIB
6
7Upstream-Status: Submitted
8
9Allow users (build systems) to specify PYLIB. This allows for a
10cross-build-system to specify the target PYLIB rather than the host
11PYLIB.
12
13Signed-off-by: Darren Hart <dvhart@linux.intel.com>
14CC: Clark Williams <williams@redhat.com>
15CC: John Kacur <jkacur@redhat.com>
16---
17 Makefile | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Makefile b/Makefile
21index 3a82407..61e2f9f 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -23,7 +23,7 @@ endif
25 CFLAGS ?= -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
26 LDFLAGS ?=
27
28-PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
29+PYLIB ?= $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
30
31 ifndef DEBUG
32 CFLAGS += -O2
33--
341.7.11.4
35
diff --git a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch b/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch
deleted file mode 100644
index bc6136f1de..0000000000
--- a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From af93e580d005a2bba6ed36528003af4cf631adb8 Mon Sep 17 00:00:00 2001
2Message-Id: <af93e580d005a2bba6ed36528003af4cf631adb8.1347419597.git.dvhart@linux.intel.com>
3In-Reply-To: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
4References: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
5From: Darren Hart <dvhart@linux.intel.com>
6Date: Tue, 11 Sep 2012 14:51:10 -0700
7Subject: [PATCH 2/2] rt-tests: Break out install_hwlatdetect
8
9Upstream-Status: Submitted
10
11Allow hwlatdetect to be installed independently of the rest of the
12tests. This is convenient for build systems that package it separately
13due to the python dependency.
14
15Signed-off-by: Darren Hart <dvhart@linux.intel.com>
16CC: Clark Williams <williams@redhat.com>
17CC: John Kacur <jkacur@redhat.com>
18---
19 Makefile | 18 +++++++++++-------
20 1 file changed, 11 insertions(+), 7 deletions(-)
21
22diff --git a/Makefile b/Makefile
23index 61e2f9f..636e63b 100644
24--- a/Makefile
25+++ b/Makefile
26@@ -119,21 +119,15 @@ changelog:
27 git log >ChangeLog
28
29 .PHONY: install
30-install: all
31+install: all install_hwlatdetect
32 mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
33 mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8"
34 cp $(TARGETS) "$(DESTDIR)$(bindir)"
35- if test -n "$(PYLIB)" ; then \
36- install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
37- rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
38- ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
39- fi
40 install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
41 install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
42 gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
43 gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
44 gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
45- gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz"
46 gzip src/ptsematest/ptsematest.8 -c >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
47 gzip src/sigwaittest/sigwaittest.8 -c >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
48 gzip src/svsematest/svsematest.8 -c >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
49@@ -141,6 +135,16 @@ install: all
50 gzip src/backfire/sendme.8 -c >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
51 gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
52
53+.PHONY: install_hwlatdetect
54+install_hwlatdetect: hwlatdetect
55+ if test -n "$(PYLIB)" ; then \
56+ mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man8" ; \
57+ install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
58+ rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
59+ ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
60+ gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
61+ fi
62+
63 .PHONY: release
64 release: clean changelog
65 mkdir -p releases
66--
671.7.11.4
68
diff --git a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch
deleted file mode 100644
index e4202823e3..0000000000
--- a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 82d28701486ba5a699544a168448bf93b1ccd7b1 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Thu, 6 Dec 2012 11:26:14 +0800
4Subject: [PATCH] Added missing dependencies
5
6Upstream-Status: Submitted [linux-rt-users]
7
8The following targets missed dependency on librttest.a:
9pi_stress
10rt-migrate-test
11hackbench
12
13Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
14---
15 Makefile | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/Makefile b/Makefile
19index fd3cdb3..60707a7 100644
20--- a/Makefile
21+++ b/Makefile
22@@ -68,14 +68,14 @@ cyclictest: cyclictest.o librttest.a
23 signaltest: signaltest.o librttest.a
24 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
25
26-pi_stress: pi_stress.o
27+pi_stress: pi_stress.o librttest.a
28 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
29
30 hwlatdetect: src/hwlatdetect/hwlatdetect.py
31 chmod +x src/hwlatdetect/hwlatdetect.py
32 ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
33
34-rt-migrate-test: rt-migrate-test.o
35+rt-migrate-test: rt-migrate-test.o librttest.a
36 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
37
38 ptsematest: ptsematest.o librttest.a
39@@ -96,7 +96,7 @@ sendme: sendme.o librttest.a
40 pip_stress: pip_stress.o librttest.a
41 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
42
43-hackbench: hackbench.o
44+hackbench: hackbench.o librttest.a
45 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
46
47 librttest.a: rt-utils.o error.o rt-get_cpu.o
48--
491.7.9.5
50
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 81f4f2b109..1d876b0684 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,10 +1,7 @@
1# Version v0.87 1# Version v0.89
2SRCREV = "b0413ae5ed802004fb0c4af74a1757381fd2b91f" 2SRCREV = "9164ec4db2645f52ffdd20e6d1b72bb0411ab40e"
3 3
4SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \ 4SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \
5 file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \
6 file://0002-rt-tests-Break-out-install_hwlatdetect.patch \
7 file://added-missing-dependencies.patch \
8 file://hackbench-fix-error-check.patch \ 5 file://hackbench-fix-error-check.patch \
9" 6"
10 7
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.87.bb b/meta/recipes-rt/rt-tests/rt-tests_0.89.bb
index df646de8ed..df646de8ed 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.87.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.89.bb