From 19a3bdd4a7f5692c26203f474994f480cf36df69 Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarak@gmail.com>
Date: Tue, 13 Dec 2022 23:55:50 +0100
Subject: [PATCH] Remove the `--strict` option

---
 docs/manpage.rst                       | 4 ----
 docs/tutorial_tips_tricks.rst          | 2 +-
 reframe/frontend/cli.py                | 5 -----
 reframe/frontend/executors/__init__.py | 4 ----
 unittests/test_policies.py             | 7 +++++--
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/docs/manpage.rst b/docs/manpage.rst
index 537e6bf0bf..1670a975cb 100644
--- a/docs/manpage.rst
+++ b/docs/manpage.rst
@@ -621,10 +621,6 @@ Options controlling ReFrame execution
 
    Skip sanity checking phase.
 
-.. option:: --strict
-
-   Enforce strict performance checking, even if a performance test is marked as not performance critical by having set its :attr:`strict_check` attribute to :class:`False`.
-
 
 ----------------------------------
 Options controlling job submission
diff --git a/docs/tutorial_tips_tricks.rst b/docs/tutorial_tips_tricks.rst
index 807379d6c6..74261bd709 100644
--- a/docs/tutorial_tips_tricks.rst
+++ b/docs/tutorial_tips_tricks.rst
@@ -177,7 +177,7 @@ The following configuration defines an execution mode named ``maintenance`` and
            'options': [
                '--unload-module=reframe',
                '--exec-policy=async',
-               '--strict',
+               '-S strict_check=1',
                '--output=/path/to/$USER/regression/maintenance',
                '--perflogdir=/path/to/$USER/regression/maintenance/logs',
                '--stage=$SCRATCH/regression/maintenance/stage',
diff --git a/reframe/frontend/cli.py b/reframe/frontend/cli.py
index fbb384e02d..b600b06424 100644
--- a/reframe/frontend/cli.py
+++ b/reframe/frontend/cli.py
@@ -447,10 +447,6 @@ def main():
         '--skip-system-check', action='store_true',
         help='Skip system check'
     )
-    run_options.add_argument(
-        '--strict', action='store_true',
-        help='Enforce strict performance checking'
-    )
 
     # Environment options
     env_options.add_argument(
@@ -1234,7 +1230,6 @@ def module_unuse(*paths):
             sys.exit(1)
 
         exec_policy.force_local = options.force_local
-        exec_policy.strict_check = options.strict
         exec_policy.skip_sanity_check = options.skip_sanity_check
         exec_policy.skip_performance_check = options.skip_performance_check
         exec_policy.keep_stage_files = site_config.get(
diff --git a/reframe/frontend/executors/__init__.py b/reframe/frontend/executors/__init__.py
index dbeb54cb05..1f3e149d22 100644
--- a/reframe/frontend/executors/__init__.py
+++ b/reframe/frontend/executors/__init__.py
@@ -592,7 +592,6 @@ def __init__(self):
         self.keep_stage_files = False
         self.only_environs = None
         self.printer = None
-        self.strict_check = False
 
         # Local scheduler for running forced local jobs
         self.local_scheduler = LocalJobScheduler()
@@ -615,8 +614,5 @@ def exit(self):
     def runcase(self, case):
         '''Run a test case.'''
 
-        if self.strict_check:
-            case.check.strict_check = True
-
         if self.force_local:
             case.check.local = True
diff --git a/unittests/test_policies.py b/unittests/test_policies.py
index f86a1a22cb..8ded1e0761 100644
--- a/unittests/test_policies.py
+++ b/unittests/test_policies.py
@@ -360,8 +360,11 @@ def test_runall_maxfail(make_runner, make_cases, common_exec_ctx):
 
 def test_strict_performance_check(make_runner, make_cases, common_exec_ctx):
     runner = make_runner()
-    runner.policy.strict_check = True
-    runner.runall(make_cases())
+    cases = make_cases()
+    for c in cases:
+        c.check.strict_check = True
+
+    runner.runall(cases)
     stats = runner.stats
     assert 9 == stats.num_cases()
     assert_runall(runner)