fixup! Add custom action and unified Linux build

Author: mshabunin

scripts/runner.py

@@ -71,13 +71,14 @@ def run_one(name, cmd, logname, env, args):
 
     print("::group::Run {}".format(name), flush=True)
     print("Run: {}".format(cmd), flush=True)
+    print("Env: {}".format(env), flush=True)
     print("Log: {}".format(logname), flush=True)
 
     status = 0
     logfd = None
     try:
         logfd = open(logname, 'wb')
-        proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, cwd=args.workdir, env=(dict(os.environ) | env))
+        proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, cwd=args.workdir, env=(os.environ | env))
         read_process(proc, args.timeout, args.verbose, logfd)
         proc.wait()
         status = proc.returncode
@@ -156,7 +157,7 @@ def run_one(name, cmd, logname, env, args):
                         break # Note: only one exe change
             # Change environment
             if opt_node["env"]:
-                for k, v in opt_node["exe"].items():
+                for k, v in opt_node["env"].items():
                     if k in name:
                         env |= v
 

scripts/test-plan.json

@@ -1,6 +1,6 @@
 {
     "suites": {
-        "smoke": ["opencv_test_ml", "opencv_test_videoio", "opencv_test_highgui", "opencv_perf_photo"],
+        "smoke": ["opencv_test_dnn_classic", "opencv_test_ml", "opencv_test_videoio", "opencv_test_highgui", "opencv_perf_photo"],
         "linux-4.x": [
             "opencv_test_calib3d",
             "opencv_test_core",
@@ -96,7 +96,7 @@
             },
             "env": {
                 "opencv_test_dnn_classic": {
-                    "OPENCV_FORCE_DNN_ENGINE": 1
+                    "OPENCV_FORCE_DNN_ENGINE": "1"
                 }
             }
         }