From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Jul 2023 02:57:46 +0000 (+1000)
Subject: Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e4d33e8f506da9aeda58a1b12a46420a3704b80c;p=users%2Fwilly%2Fpagecache.git

Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
---

e4d33e8f506da9aeda58a1b12a46420a3704b80c
diff --cc rust/Makefile
index dda1aecb8161e,92482144c0bb9..68c8c5a79a51d
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -157,9 -162,30 +165,30 @@@ quiet_cmd_rustdoc_test = RUSTDOC T $
  		@$(objtree)/include/generated/rustc_cfg \
  		$(rustc_target_flags) $(rustdoc_test_target_flags) \
  		--sysroot $(objtree)/$(obj)/test/sysroot $(rustdoc_test_quiet) \
 -		-L$(objtree)/$(obj)/test --output $(objtree)/$(obj)/doc \
 +		-L$(objtree)/$(obj)/test --output $(rustdoc_output) \
  		--crate-name $(subst rusttest-,,$@) $<
  
+ quiet_cmd_rustdoc_test_kernel = RUSTDOC TK $<
+       cmd_rustdoc_test_kernel = \
+ 	rm -rf $(objtree)/$(obj)/test/doctests/kernel; \
+ 	mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \
+ 	OBJTREE=$(abspath $(objtree)) \
+ 	$(RUSTDOC) --test $(rust_flags) \
+ 		@$(objtree)/include/generated/rustc_cfg \
+ 		-L$(objtree)/$(obj) --extern alloc --extern kernel \
+ 		--extern build_error --extern macros \
+ 		--extern bindings --extern uapi \
+ 		--no-run --crate-name kernel -Zunstable-options \
+ 		--test-builder $(objtree)/scripts/rustdoc_test_builder \
+ 		$< $(rustdoc_test_kernel_quiet); \
+ 	$(objtree)/scripts/rustdoc_test_gen
+ 
+ %/doctests_kernel_generated.rs %/doctests_kernel_generated_kunit.c: \
+     $(src)/kernel/lib.rs $(obj)/kernel.o \
+     $(objtree)/scripts/rustdoc_test_builder \
+     $(objtree)/scripts/rustdoc_test_gen FORCE
+ 	$(call if_changed,rustdoc_test_kernel)
+ 
  # We cannot use `-Zpanic-abort-tests` because some tests are dynamic,
  # so for the moment we skip `-Cpanic=abort`.
  quiet_cmd_rustc_test = RUSTC T  $<