Skip to content

Commit f803915

Browse files
committed
build-configs: Build kselftest-slim
Add kselftest-slim builds everywhere we build kselftest. Signed-off-by: Mark Brown <[email protected]>
1 parent 7a8e27a commit f803915

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

config/core/build-configs-cip.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,21 @@ cip_variants_kselftest: &cip_variants_kselftest
5959
<<: *cip_architectures
6060
arm:
6161
base_defconfig: 'multi_v7_defconfig'
62-
fragments: [kselftest]
62+
fragments: [kselftest, kselftest-slim]
6363
extra_configs: ['allnoconfig']
6464
arm64:
6565
fragments: [kselftest, arm64-chromebook]
6666
extra_configs:
6767
- 'allnoconfig'
6868
- 'defconfig+arm64-chromebook+kselftest'
69+
- 'defconfig+arm64-chromebook+kselftest-slim'
6970
x86_64:
7071
base_defconfig: 'x86_64_defconfig'
7172
fragments: [kselftest, x86-chromebook]
7273
extra_configs:
7374
- 'allnoconfig'
7475
- 'x86_64_defconfig+x86-chromebook+kselftest'
76+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
7577

7678

7779
cip_variants_preempt_rt: &cip_variants_preempt_rt

config/core/build-configs-stable.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,20 @@ stable_variants_kselftest: &stable_variants_kselftest
7070
arm:
7171
base_defconfig: 'multi_v7_defconfig'
7272
extra_configs: ['allnoconfig']
73-
fragments: [kselftest]
73+
fragments: [kselftest, kselftest-slim]
7474
arm64:
7575
extra_configs:
7676
- 'allnoconfig'
7777
- 'defconfig+arm64-chromebook+kselftest'
78+
- 'defconfig+arm64-chromebook+kselftest-slim'
7879
fragments: [arm64-chromebook, kselftest]
7980
x86_64:
8081
base_defconfig: 'x86_64_defconfig'
8182
extra_configs:
8283
- 'allnoconfig'
8384
- 'x86_64_defconfig+x86-chromebook+kselftest'
84-
fragments: [x86-chromebook, kselftest]
85+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
86+
fragments: [x86-chromebook, kselftest, kselftest-slim]
8587

8688

8789
build_configs:

config/core/build-configs.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,13 @@ fragments:
425425
- 'CONFIG_NET_IPGRE=m'
426426
- 'CONFIG_NET_IPGRE_DEMUX=m'
427427

428+
kselftest-slim:
429+
path: "kernel/configs/kselftest-slim.config"
430+
configs:
431+
- '# CONFIG_DUMMY is not set'
432+
- 'CONFIG_NET_IPGRE=m'
433+
- 'CONFIG_NET_IPGRE_DEMUX=m'
434+
428435
preempt_rt:
429436
path: "kernel/configs/preempt_rt.config"
430437
configs:
@@ -661,6 +668,7 @@ build_configs_defaults:
661668
fragments: &default_fragments
662669
- 'debug'
663670
- 'kselftest'
671+
- 'kselftest-slim'
664672
- 'tinyconfig'
665673

666674
architectures: &default_architectures
@@ -698,6 +706,7 @@ build_configs_defaults:
698706
- 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
699707
- 'defconfig+CONFIG_RANDOMIZE_BASE=y'
700708
- 'defconfig+arm64-chromebook+kselftest'
709+
- 'defconfig+arm64-chromebook+kselftest-slim'
701710
- 'defconfig+arm64-chromebook+videodec'
702711
fragments: [arm64-chromebook, crypto, ima, videodec]
703712

@@ -727,6 +736,7 @@ build_configs_defaults:
727736
- 'allmodconfig'
728737
- 'allnoconfig'
729738
- 'x86_64_defconfig+x86-chromebook+kselftest'
739+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
730740
- 'x86_64_defconfig+x86-chromebook+amdgpu'
731741
fragments: [amdgpu, crypto, ima, x86_kvm_guest, x86-chromebook]
732742

@@ -996,15 +1006,19 @@ build_configs:
9961006
arm64: &arm64-kselftest
9971007
<<: *arm64_defconfig
9981008
fragments: [arm64-chromebook]
999-
extra_configs: ['defconfig+kselftest+arm64-chromebook']
1009+
extra_configs: [
1010+
'defconfig+kselftest+arm64-chromebook',
1011+
'defconfig+kselftest-slim+arm64-chromebook']
10001012
filters: *kselftest-only
10011013
i386:
10021014
<<: *i386_defconfig
10031015
filters: *kselftest-only
10041016
x86_64: &x86_64-kselftest
10051017
<<: *x86_64_defconfig
10061018
fragments: [x86-chromebook]
1007-
extra_configs: ['x86_64+defconfig+kselftest+x86-chromebook']
1019+
extra_configs: [
1020+
'x86_64+defconfig+kselftest+x86-chromebook',
1021+
'x86_64+defconfig+kselftest-slim+x86-chromebook']
10081022
filters: *kselftest-only
10091023
clang-16:
10101024
build_environment: clang-16
@@ -1057,7 +1071,7 @@ build_configs:
10571071
architectures: *arch_clang_configs
10581072
rustc-1.62:
10591073
build_environment: rustc-1.62
1060-
fragments: [rust, rust-samples, kselftest]
1074+
fragments: [rust, rust-samples, kselftest, kselftest-slim]
10611075
architectures:
10621076
x86_64:
10631077
base_defconfig: 'x86_64_defconfig'
@@ -1117,6 +1131,7 @@ build_configs:
11171131
- 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
11181132
- 'defconfig+CONFIG_RANDOMIZE_BASE=y'
11191133
- 'defconfig+arm64-chromebook+kselftest'
1134+
- 'defconfig+arm64-chromebook+kselftest-slim'
11201135
arm:
11211136
base_defconfig: 'multi_v7_defconfig'
11221137
extra_configs:
@@ -1270,7 +1285,7 @@ build_configs:
12701285
variants:
12711286
rustc-1.66:
12721287
build_environment: rustc-1.66
1273-
fragments: [rust, rust-for-linux-samples, kselftest]
1288+
fragments: [rust, rust-for-linux-samples, kselftest, kselftest-slim]
12741289
architectures:
12751290
x86_64:
12761291
base_defconfig: 'x86_64_defconfig'
@@ -1281,7 +1296,7 @@ build_configs:
12811296
variants:
12821297
rustc-1.62:
12831298
build_environment: rustc-1.62
1284-
fragments: [rust, rust-samples, kselftest]
1299+
fragments: [rust, rust-samples, kselftest, kselftest-slim]
12851300
architectures:
12861301
x86_64:
12871302
base_defconfig: 'x86_64_defconfig'

0 commit comments

Comments
 (0)