| Message ID | 20240802124536.2905797-1-anders.roxell@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fe8340a750002269a3e4178efa1229a88814a656 |
| Headers | show |
| Series | [1/2] selftests: rust: config: add trailing newline | expand |
On Fri, Aug 2, 2024 at 2:45 PM Anders Roxell <anders.roxell@linaro.org> wrote: > > If adding multiple config files to the merge_config.sh script and > rust/config is the fist one, then the last config fragment in this file > and the first config fragment in the second file wont be set, since > there isn't a newline in this file, so those two fragements end up at > the same row like: > CONFIG_SAMPLE_RUST_PRINT=mCONFIG_FRAGMENT=y > > And non of those will be enabled when running 'olddefconfig' after. > > Fixing the issue by adding a newline to the file. Could `merge_config.sh` be improved too? Shuah, if you plan to pick this: Acked-by: Miguel Ojeda <ojeda@kernel.org> Thanks! Cheers, Miguel
On 8/10/24 04:33, Miguel Ojeda wrote: > On Fri, Aug 2, 2024 at 2:45 PM Anders Roxell <anders.roxell@linaro.org> wrote: >> >> If adding multiple config files to the merge_config.sh script and >> rust/config is the fist one, then the last config fragment in this file >> and the first config fragment in the second file wont be set, since >> there isn't a newline in this file, so those two fragements end up at >> the same row like: >> CONFIG_SAMPLE_RUST_PRINT=mCONFIG_FRAGMENT=y >> >> And non of those will be enabled when running 'olddefconfig' after. >> >> Fixing the issue by adding a newline to the file. > > Could `merge_config.sh` be improved too? > > Shuah, if you plan to pick this: > > Acked-by: Miguel Ojeda <ojeda@kernel.org> > > Thanks! > > Cheers, > Miguel Applied to linux-kselftest next for Linux 6.12-rc1. thanks, -- Shuah
diff --git a/tools/testing/selftests/rust/config b/tools/testing/selftests/rust/config index b4002acd40bc..fa06cebae232 100644 --- a/tools/testing/selftests/rust/config +++ b/tools/testing/selftests/rust/config @@ -2,4 +2,4 @@ CONFIG_RUST=y CONFIG_SAMPLES=y CONFIG_SAMPLES_RUST=y CONFIG_SAMPLE_RUST_MINIMAL=m -CONFIG_SAMPLE_RUST_PRINT=m \ No newline at end of file +CONFIG_SAMPLE_RUST_PRINT=m
If adding multiple config files to the merge_config.sh script and rust/config is the fist one, then the last config fragment in this file and the first config fragment in the second file wont be set, since there isn't a newline in this file, so those two fragements end up at the same row like: CONFIG_SAMPLE_RUST_PRINT=mCONFIG_FRAGMENT=y And non of those will be enabled when running 'olddefconfig' after. Fixing the issue by adding a newline to the file. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- tools/testing/selftests/rust/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)