Load sh_test and sh_binary rules from rules_shell

avdv · avdv · commit 0139d136574b · 2025-08-08T22:13:25.000+02:00
diff --git a/haskell/BUILD.bazel b/haskell/BUILD.bazel
@@ -23,6 +23,7 @@ load(
     "haskell_toolchain_info",
 )
 load("@rules_python//python:defs.bzl", "py_binary", "py_library")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 exports_files(
     glob(["*.bzl"]) + [
diff --git a/haskell/private/cc_wrapper.bzl b/haskell/private/cc_wrapper.bzl
@@ -2,6 +2,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
 load("@rules_python//python:defs.bzl", "py_binary")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 # Note [On configuring the cc_wrapper]
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/haskell/repl.bzl b/haskell/repl.bzl
@@ -4,6 +4,7 @@ load("@bazel_skylib//lib:new_sets.bzl", "sets")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//lib:shell.bzl", "shell")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(":cc.bzl", "ghc_cc_program_args")
 load(
     ":private/cc_libraries.bzl",
diff --git a/rules_haskell_nix/BUILD.bazel b/rules_haskell_nix/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 buildifier(
     name = "buildifier",
diff --git a/rules_haskell_tests/tests/BUILD.bazel b/rules_haskell_tests/tests/BUILD.bazel
@@ -25,6 +25,7 @@ load(
 )
 load("@rules_haskell//tests:inline_tests.bzl", "sh_inline_test")
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//tests:rule_test_exe.bzl", "rule_test_exe")
 load("//tests:test_haddock.bzl", "expected_values")
 
diff --git a/rules_haskell_tests/tests/ghc-check/BUILD.bazel b/rules_haskell_tests/tests/ghc-check/BUILD.bazel
@@ -7,6 +7,7 @@ load(
     "@rules_haskell//haskell:defs.bzl",
     "haskell_test",
 )
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 haskell_test(
     name = "ghc-check",
diff --git a/rules_haskell_tests/tests/ghcide/BUILD.bazel b/rules_haskell_tests/tests/ghcide/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@os_info//:os_info.bzl", "is_windows")
 load("@rules_haskell//tools/ghc-paths:defs.bzl", "add_data")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 add_data(
     name = "ghcide",
diff --git a/rules_haskell_tests/tests/haddock/BUILD.bazel b/rules_haskell_tests/tests/haddock/BUILD.bazel
@@ -3,6 +3,7 @@ load(
     "haskell_doc",
     "haskell_library",
 )
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 package(
     default_testonly = 1,
diff --git a/rules_haskell_tests/tests/haskell_cabal_datafiles/compare_other_cabal_functions/BUILD.bazel b/rules_haskell_tests/tests/haskell_cabal_datafiles/compare_other_cabal_functions/BUILD.bazel
@@ -6,6 +6,7 @@
 #
 
 load("@os_info//:os_info.bzl", "is_windows")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 sh_test(
     name = "same_other_functions{}".format(".exe" if is_windows else ""),
diff --git a/rules_haskell_tests/tests/haskell_cabal_datafiles/haskell_cabal_binary_with_datafiles/BUILD.bazel b/rules_haskell_tests/tests/haskell_cabal_datafiles/haskell_cabal_binary_with_datafiles/BUILD.bazel
@@ -9,6 +9,7 @@ load(
     "@rules_haskell//haskell:defs.bzl",
     "haskell_toolchain_library",
 )
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 package(default_testonly = 1)
 
diff --git a/rules_haskell_tests/tests/haskell_cabal_datafiles/haskell_cabal_library_with_datafiles/BUILD.bazel b/rules_haskell_tests/tests/haskell_cabal_datafiles/haskell_cabal_library_with_datafiles/BUILD.bazel
@@ -11,6 +11,7 @@ load(
     "haskell_test",
     "haskell_toolchain_library",
 )
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 package(default_testonly = 1)
 
diff --git a/rules_haskell_tests/tests/haskell_cabal_datafiles/other_script/src/BUILD.bazel b/rules_haskell_tests/tests/haskell_cabal_datafiles/other_script/src/BUILD.bazel
@@ -1,6 +1,7 @@
 # Test that datafiles of a haskell_cabal_binary with generate_paths_module are accessible.
 
 load("@os_info//:os_info.bzl", "is_windows")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 package(default_testonly = 1)
 
diff --git a/rules_haskell_tests/tests/haskell_cabal_indirect_link/BUILD.bazel b/rules_haskell_tests/tests/haskell_cabal_indirect_link/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@os_info//:os_info.bzl", "is_windows")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_haskell//haskell:cabal.bzl", "haskell_cabal_binary", "haskell_cabal_library")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 # This test shows that haskell_cabal_library and
 # haskell_cabal_binary handle indirect C dependencies
diff --git a/rules_haskell_tests/tests/library-linkstatic-flag/BUILD.bazel b/rules_haskell_tests/tests/library-linkstatic-flag/BUILD.bazel
@@ -3,6 +3,7 @@ load(
     "haskell_library",
 )
 load("@rules_haskell//tests:inline_tests.bzl", "sh_inline_test")
+load("@rules_shell//shell:sh_library.bzl", "sh_library")
 load(":get_library_files.bzl", "get_libraries_as_runfiles")
 
 # test whether `linkstatic` works as expected
diff --git a/rules_haskell_tests/tests/runfiles/BUILD.bazel b/rules_haskell_tests/tests/runfiles/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@os_info//:os_info.bzl", "is_windows")
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("@rules_haskell//haskell:defs.bzl", "haskell_binary")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 package(default_testonly = 1)
 
diff --git a/tests/inline_tests.bzl b/tests/inline_tests.bzl
@@ -4,6 +4,7 @@
 
 load("@bazel_skylib//lib:shell.bzl", "shell")
 load("@rules_python//python:defs.bzl", "py_test")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 def quote_make_variables(s):
     """Quote all genrule “Make” Variables in a string."""
diff --git a/tests/protoc.bzl b/tests/protoc.bzl
@@ -1,4 +1,5 @@
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 def _protoc_wrapper_impl(ctx):
     """

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ load(`
`23`	`23`	`"haskell_toolchain_info",`
`24`	`24`	`)`
`25`	`25`	`load("@rules_python//python:defs.bzl", "py_binary", "py_library")`
	`26`	`+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")`
`26`	`27`
`27`	`28`	`exports_files(`
`28`	`29`	`glob(["*.bzl"]) + [`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test")`
	`2`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`2`	`3`
`3`	`4`	`buildifier(`
`4`	`5`	`name = "buildifier",`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ load(`
`25`	`25`	`)`
`26`	`26`	`load("@rules_haskell//tests:inline_tests.bzl", "sh_inline_test")`
`27`	`27`	`load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")`
	`28`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`28`	`29`	`load("//tests:rule_test_exe.bzl", "rule_test_exe")`
`29`	`30`	`load("//tests:test_haddock.bzl", "expected_values")`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ load(`
`7`	`7`	`"@rules_haskell//haskell:defs.bzl",`
`8`	`8`	`"haskell_test",`
`9`	`9`	`)`
	`10`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`10`	`11`
`11`	`12`	`haskell_test(`
`12`	`13`	`name = "ghc-check",`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ load(`
`3`	`3`	`"haskell_doc",`
`4`	`4`	`"haskell_library",`
`5`	`5`	`)`
	`6`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`6`	`7`
`7`	`8`	`package(`
`8`	`9`	`default_testonly = 1,`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`#`
`7`	`7`
`8`	`8`	`load("@os_info//:os_info.bzl", "is_windows")`
	`9`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`9`	`10`
`10`	`11`	`sh_test(`
`11`	`12`	`name = "same_other_functions{}".format(".exe" if is_windows else ""),`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ load(`
`9`	`9`	`"@rules_haskell//haskell:defs.bzl",`
`10`	`10`	`"haskell_toolchain_library",`
`11`	`11`	`)`
	`12`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
`12`	`13`
`13`	`14`	`package(default_testonly = 1)`
`14`	`15`