Skip to content

Commit 9b17722

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 6ba1dba commit 9b17722

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:
@@ -712,6 +719,7 @@ build_configs_defaults:
712719
fragments: &default_fragments
713720
- 'debug'
714721
- 'kselftest'
722+
- 'kselftest-slim'
715723
- 'tinyconfig'
716724

717725
architectures: &default_architectures
@@ -749,6 +757,7 @@ build_configs_defaults:
749757
- 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
750758
- 'defconfig+CONFIG_RANDOMIZE_BASE=y'
751759
- 'defconfig+arm64-chromebook+kselftest'
760+
- 'defconfig+arm64-chromebook+kselftest-slim'
752761
- 'defconfig+arm64-chromebook+videodec'
753762
fragments: [arm64-chromebook, crypto, ima, videodec]
754763

@@ -778,6 +787,7 @@ build_configs_defaults:
778787
- 'allmodconfig'
779788
- 'allnoconfig'
780789
- 'x86_64_defconfig+x86-chromebook+kselftest'
790+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
781791
- 'x86_64_defconfig+x86-chromebook+amdgpu'
782792
fragments: [amdgpu, crypto, ima, x86_kvm_guest, x86-chromebook]
783793

@@ -1047,15 +1057,19 @@ build_configs:
10471057
arm64: &arm64-kselftest
10481058
<<: *arm64_defconfig
10491059
fragments: [arm64-chromebook]
1050-
extra_configs: ['defconfig+kselftest+arm64-chromebook']
1060+
extra_configs: [
1061+
'defconfig+kselftest+arm64-chromebook',
1062+
'defconfig+kselftest-slim+arm64-chromebook']
10511063
filters: *kselftest-only
10521064
i386:
10531065
<<: *i386_defconfig
10541066
filters: *kselftest-only
10551067
x86_64: &x86_64-kselftest
10561068
<<: *x86_64_defconfig
10571069
fragments: [x86-chromebook]
1058-
extra_configs: ['x86_64+defconfig+kselftest+x86-chromebook']
1070+
extra_configs: [
1071+
'x86_64+defconfig+kselftest+x86-chromebook',
1072+
'x86_64+defconfig+kselftest-slim+x86-chromebook']
10591073
filters: *kselftest-only
10601074
clang-16:
10611075
build_environment: clang-16
@@ -1108,7 +1122,7 @@ build_configs:
11081122
architectures: *arch_clang_configs
11091123
rustc-1.62:
11101124
build_environment: rustc-1.62
1111-
fragments: [rust, rust-samples, kselftest]
1125+
fragments: [rust, rust-samples, kselftest, kselftest-slim]
11121126
architectures:
11131127
x86_64:
11141128
base_defconfig: 'x86_64_defconfig'
@@ -1168,6 +1182,7 @@ build_configs:
11681182
- 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
11691183
- 'defconfig+CONFIG_RANDOMIZE_BASE=y'
11701184
- 'defconfig+arm64-chromebook+kselftest'
1185+
- 'defconfig+arm64-chromebook+kselftest-slim'
11711186
arm:
11721187
base_defconfig: 'multi_v7_defconfig'
11731188
extra_configs:
@@ -1336,7 +1351,7 @@ build_configs:
13361351
variants:
13371352
rustc-1.66:
13381353
build_environment: rustc-1.66
1339-
fragments: [rust, rust-for-linux-samples, kselftest]
1354+
fragments: [rust, rust-for-linux-samples, kselftest, kselftest-slim]
13401355
architectures:
13411356
x86_64:
13421357
base_defconfig: 'x86_64_defconfig'
@@ -1347,7 +1362,7 @@ build_configs:
13471362
variants:
13481363
rustc-1.62:
13491364
build_environment: rustc-1.62
1350-
fragments: [rust, rust-samples, kselftest]
1365+
fragments: [rust, rust-samples, kselftest, kselftest-slim]
13511366
architectures:
13521367
x86_64:
13531368
base_defconfig: 'x86_64_defconfig'

0 commit comments

Comments
 (0)