[PATCH 1/2] selftests: rust: config: add trailing newline

[PATCH 1/2] selftests: rust: config: add trailing newline

[Anders Roxell]

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(-)

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
-- 
2.43.0

[PATCH 2/2] selftests: rust: config: disable GCC_PLUGINS

[Anders Roxell]

CONFIG_RUST depends on !CONFIG_GCC_PLUGINS. Disable CONFIG_GCC_PLUGINS
in rust/config file to make sure it doesn't get enabled.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 tools/testing/selftests/rust/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/rust/config b/tools/testing/selftests/rust/config
index fa06cebae232..5f942b5c8c17 100644
--- a/tools/testing/selftests/rust/config
+++ b/tools/testing/selftests/rust/config
@@ -1,3 +1,4 @@
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_RUST=y
 CONFIG_SAMPLES=y
 CONFIG_SAMPLES_RUST=y
-- 
2.43.0

Re: [PATCH 1/2] selftests: rust: config: add trailing newline

[Miguel Ojeda]

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

Re: [PATCH 2/2] selftests: rust: config: disable GCC_PLUGINS

[Miguel Ojeda]

On Fri, Aug 2, 2024 at 2:45 PM Anders Roxell <anders.roxell@linaro.org> wrote:
>
> CONFIG_RUST depends on !CONFIG_GCC_PLUGINS. Disable CONFIG_GCC_PLUGINS
> in rust/config file to make sure it doesn't get enabled.
>
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Acked-by: Miguel Ojeda <ojeda@kernel.org>

When https://lore.kernel.org/rust-for-linux/20240731125615.3368813-1-neal@gompa.dev/
goes in, this could also be relaxed.

Thanks!

Cheers,
Miguel

Re: [PATCH 2/2] selftests: rust: config: disable GCC_PLUGINS

[Shuah Khan]

On 8/10/24 04:34, Miguel Ojeda wrote:
> On Fri, Aug 2, 2024 at 2:45 PM Anders Roxell <anders.roxell@linaro.org> wrote:
>>
>> CONFIG_RUST depends on !CONFIG_GCC_PLUGINS. Disable CONFIG_GCC_PLUGINS
>> in rust/config file to make sure it doesn't get enabled.
>>
>> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> 
> Acked-by: Miguel Ojeda <ojeda@kernel.org>
> 
> When https://lore.kernel.org/rust-for-linux/20240731125615.3368813-1-neal@gompa.dev/
> goes in, this could also be relaxed.
> 
> Thanks!
> 
> Cheers,
> Miguel

Applied to linux-kselftest next for Linux 6.12-rc1.

thanks,
-- Shuah

Re: [PATCH 1/2] selftests: rust: config: add trailing newline

[Shuah Khan]

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