aboutsummaryrefslogtreecommitdiff
path: root/root/cyclictest/.config
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2015-08-13 15:53:06 +0200
committerKarel Kočí <cynerd@email.cz>2015-08-13 15:53:06 +0200
commitb6abf4e8fe0c3b40305dfdd0410abfbf3c804874 (patch)
tree0e63a8695c793e79ba1b64b6674002c02f514040 /root/cyclictest/.config
parenta8c91e078ccb3780a53748cc52b7974bfc65b636 (diff)
parent72316e351df5159384d70faa708224ff2fcc8dd2 (diff)
downloadlinux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.tar.gz
linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.tar.bz2
linux-conf-perf-b6abf4e8fe0c3b40305dfdd0410abfbf3c804874.zip
Merge branch 'measuring'
Removing measuring branch. Idea was to make measuring configuration separate from master. But keeping changes in master and measuring branch consistent was pain.
Diffstat (limited to 'root/cyclictest/.config')
-rw-r--r--root/cyclictest/.config7
1 files changed, 6 insertions, 1 deletions
diff --git a/root/cyclictest/.config b/root/cyclictest/.config
index 9691d02..0b86ab6 100644
--- a/root/cyclictest/.config
+++ b/root/cyclictest/.config
@@ -358,7 +358,7 @@ BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS=y
# BR2_PACKAGE_PV is not set
# BR2_PACKAGE_RAMSMP is not set
# BR2_PACKAGE_RAMSPEED is not set
-BR2_PACKAGE_RT_TESTS=y
+# BR2_PACKAGE_RT_TESTS is not set
# BR2_PACKAGE_SPIDEV_TEST is not set
# BR2_PACKAGE_STRACE is not set
# BR2_PACKAGE_STRESS is not set
@@ -1655,3 +1655,8 @@ BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION=""
# BR2_PACKAGE_INPUT_TOOLS_EVTEST is not set
# BR2_BFIN_FDPIC is not set
# BR2_BFIN_FLAT is not set
+
+#
+# User-provided options
+#
+BR2_PACKAGE_RT_TESTS_MASTER=y