tuxmake: accept kconfig targets as positional arguments

Positional arguments ending in "config" are now treated as the
kconfig value when --kconfig is not set explicitly. Matches the
behavior of plain make:

  tuxmake --target-arch=x86_64 defconfig
  tuxmake --target-arch=arm multi_v7_defconfig
  tuxmake --target-arch=arm allmodconfig

Explicit --kconfig wins if both are given.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Author: roxell

test/test_build.py

@@ -140,6 +140,15 @@ def test_multiple_make_targets(self, linux):
         assert "make:drivers/mmc/" in names
         assert "make:kernel/livepatch/patch.o" in names
 
+    def test_no_duplicate_when_positional_and_flag(self, linux):
+        b = Build(
+            tree=linux,
+            targets=["drivers/mmc/"],
+            make_target=["drivers/mmc/"],
+        )
+        names = [t.name for t in b.targets]
+        assert names.count("make:drivers/mmc/") == 1
+
 
 class TestKconfig:
     def test_kconfig_default(self, linux, Popen):

test/test_cli.py

@@ -74,15 +74,25 @@ def test_make_target(self, builder):
         tuxmake("--make-target=drivers/mmc/")
         assert args(builder).make_target == ["drivers/mmc/"]
 
-    def test_make_target_forces_empty_targets(self, builder):
-        tuxmake("--make-target=drivers/mmc/")
-        assert args(builder).targets == []
-
     def test_make_target_with_positional(self, builder):
         tuxmake("config", "--make-target=drivers/mmc/")
         assert args(builder).targets == ["config"]
         assert args(builder).make_target == ["drivers/mmc/"]
 
+    def test_positional_kconfig(self, builder):
+        tuxmake("defconfig")
+        assert args(builder).kconfig == "defconfig"
+        assert not getattr(args(builder), "targets", [])
+
+    def test_positional_kconfig_allmodconfig(self, builder):
+        tuxmake("allmodconfig")
+        assert args(builder).kconfig == "allmodconfig"
+
+    def test_explicit_kconfig_wins_over_positional(self, builder):
+        tuxmake("--kconfig=tinyconfig", "defconfig")
+        assert args(builder).kconfig == "tinyconfig"
+        assert "defconfig" not in getattr(args(builder), "targets", [])
+
 
 class TestMakeVariables:
     def test_basic(self, builder):

test/test_cmdline.py

@@ -65,6 +65,7 @@ def test_make_target(self, cmdline):
         build = Build(targets=[], make_target=["drivers/mmc/"])
         cmd = cmdline.reproduce(build)
         assert "--make-target=drivers/mmc/" in cmd
+        assert "make:drivers/mmc/" not in cmd
 
     def test_debug(self, cmdline):
         cmd = cmdline.reproduce(Build(debug=True))

tuxmake/build.py

@@ -247,10 +247,12 @@ def __init__(
         self.make_target = make_target or []
         if self.make_target:
             self.add_target("config")
+            existing = {t.name for t in self.targets}
             for mt in self.make_target:
                 target = MakeTarget(mt, self, self.compression)
-                self.__ordering_only_targets__[target.name] = False
-                self.targets.append(target)
+                if target.name not in existing:
+                    self.__ordering_only_targets__[target.name] = False
+                    self.targets.append(target)
         self.cleanup_targets()
         self.extend_kconfig()
 

tuxmake/cli.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 import os
 import pathlib
+import re
 import subprocess
 import shlex
 import sys
@@ -141,6 +142,14 @@ def format_yes_no(b, length):
         options.make_variables = dict((arg.split("=") for arg in key_values))
         options.targets = [arg for arg in options.targets if "=" not in arg]
 
+        kconfig_re = re.compile(r"^[\w\-]+config$")
+        for arg in list(options.targets):
+            if kconfig_re.match(arg):
+                if not options.kconfig:
+                    options.kconfig = arg
+                options.targets.remove(arg)
+                break
+
     build_args = {
         k: v
         for k, v in options.__dict__.items()
@@ -159,8 +168,6 @@ def format_yes_no(b, length):
             "results_hooks",
         ]
     }
-    if options.make_target and not options.targets:
-        build_args["targets"] = []
     try:
         if options.download_all_korg_gcc_toolchains:
             with tempfile.TemporaryDirectory() as _tmpdir:

tuxmake/cmdline.py

@@ -337,6 +337,8 @@ def reproduce(self, build):
         for k, v in build.make_variables.items():
             cmd.append(f"{k}={v}")
         for target in build.targets:
+            if target.name.startswith("make:"):
+                continue
             cmd.append(target.name)
 
         return cmd