summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/rt-tests/Manifest2
-rw-r--r--dev-util/rt-tests/files/rt-tests-2.5-musl.patch (renamed from dev-util/rt-tests/files/rt-tests-2.4-musl.patch)25
-rw-r--r--dev-util/rt-tests/rt-tests-2.5.ebuild (renamed from dev-util/rt-tests/rt-tests-2.4.ebuild)0
3 files changed, 14 insertions, 13 deletions
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 498f459a860d..53604d6b138e 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1 +1 @@
-DIST rt-tests-2.4.tar.xz 104172 BLAKE2B bd7ac3ff64171b122341eec81ac61dcda429d33d6a69362d498d5db667b8cb77502d745bc2f7ce03cc1e958d02889a902f65544c7fef994fb4d7e72230c73e10 SHA512 308207ad620ee458e4ac000a9437266a84f4807d9cecd8030d5ae12a210c2a01f80a331bb60faeb41244d7ab80b3cadf8164711547a02f5afa353d1a3644d794
+DIST rt-tests-2.5.tar.xz 104596 BLAKE2B 3c03be9fb58ede744b6521cd74cef923f667c94ad8a3abb3d88efa7733f7672c8151b22e122499d1811f16ccd5a9335110eeb6c7c722c9899c369c912112f3b2 SHA512 a9966b6da89a9778f668faee5c347024a43bf978826bf16f0f8034acbf383eb688c6962e1de80e7efd34a5a0c67cb7c37ed5822979676b76a1e725d620bfd391
diff --git a/dev-util/rt-tests/files/rt-tests-2.4-musl.patch b/dev-util/rt-tests/files/rt-tests-2.5-musl.patch
index 886359894cdf..a7aca4392ebb 100644
--- a/dev-util/rt-tests/files/rt-tests-2.4-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-2.5-musl.patch
@@ -16,16 +16,16 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
Makefile | 5 --
src/backfire/sendme.c | 1
- src/cyclictest/cyclictest.c | 70 ++++------------------------------
- src/hackbench/hackbench.c | 4 +
- src/include/musl.h | 28 +++++++++++++
+ src/cyclictest/cyclictest.c | 68 ++++------------------------------
+ src/hackbench/hackbench.c | 4 +-
+ src/include/musl.h | 28 ++++++++++++++
src/lib/rt-utils.c | 1
- src/pi_tests/tst-mutexpi10.c | 2
+ src/pi_tests/tst-mutexpi10.c | 2 +
src/pmqtest/pmqtest.c | 1
src/ptsematest/ptsematest.c | 1
src/rt-migrate-test/rt-migrate-test.c | 1
src/sched_deadline/cyclicdeadline.c | 1
- 11 files changed, 48 insertions(+), 67 deletions(-)
+ 11 files changed, 47 insertions(+), 66 deletions(-)
create mode 100644 src/include/musl.h
--- a/Makefile
@@ -197,7 +197,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
/* if smp wasn't requested, test for numa automatically */
if (!smp) {
numa = numa_initialize();
-@@ -1993,7 +1940,6 @@ int main(int argc, char **argv)
+@@ -1991,7 +1938,6 @@ int main(int argc, char **argv)
}
@@ -205,18 +205,19 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
mode = use_nanosleep + use_system;
sigemptyset(&sigset);
-@@ -2043,16 +1989,18 @@ int main(int argc, char **argv)
- void *stack;
+@@ -2042,6 +1988,7 @@ int main(int argc, char **argv)
void *currstk;
size_t stksize;
+ int node_cpu = cpu;
+ int err;
- /* find the memory node associated with the cpu i */
- node = rt_numa_numa_node_of_cpu(cpu);
+ if (node_cpu == -1)
+ node_cpu = cpu_for_thread_ua(i, max_cpus);
+@@ -2050,11 +1997,12 @@ int main(int argc, char **argv)
+ node = rt_numa_numa_node_of_cpu(node_cpu);
-- /* get the stack size set for this thread */
+ /* get the stack size set for this thread */
- if (pthread_attr_getstack(&attr, &currstk, &stksize))
-+ /* get the stack size set for for this thread */
+ err = pthread_attr_getstack(&attr, &currstk, &stksize);
+ if (err != EINVAL)
fatal("failed to get stack size for thread %d\n", i);
diff --git a/dev-util/rt-tests/rt-tests-2.4.ebuild b/dev-util/rt-tests/rt-tests-2.5.ebuild
index c0f436a6cc31..c0f436a6cc31 100644
--- a/dev-util/rt-tests/rt-tests-2.4.ebuild
+++ b/dev-util/rt-tests/rt-tests-2.5.ebuild