Merge pull request #33 from shoo/fix_issue32

Fix #32 - The config option will be ignored.
shoo · Sep 3, 2021 · 8178d5f · 8178d5f
2 parents 3288e97 + 6196249
commit 8178d5f
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 4 deletions.
diff --git a/scripts/runner.d b/scripts/runner.d
@@ -444,6 +444,10 @@ void integrationTest(string[] exDubOpts = null)
 		writeln("#######################################");
 		foreach (pkgName; Defines.subPkgs)
 		{
+			// ターゲット指定がある場合は、ターゲット指定されている場合だけ実行
+			if (config.integrationTestTargets.length > 0
+				&& !config.integrationTestTargets.canFind("::" ~ pkgName))
+				continue;
 			dispLog("INFO", pkgName, "Subpackages test start");
 			auto res = Result(pkgName);
 			try

diff --git a/source/gendoc/config.d b/source/gendoc/config.d
@@ -27,6 +27,21 @@ struct PackageConfig
 	///
 	PackageConfig[] subPackages;
 
+	private static string determineConfigName(Package pkg, BuildPlatform platform, string configName)
+	{
+		import std.algorithm: canFind;
+		import std.exception: enforce;
+		auto allCfgs = pkg.getPlatformConfigurations(platform, true);
+		if (configName.length > 0)
+		{
+			enforce(allCfgs.canFind(configName), "Cannot found configuration: " ~ configName);
+			return configName;
+		}
+		if (allCfgs.canFind("gendoc"))
+			return "gendoc";
+		return pkg.getDefaultConfiguration(platform, true);
+	}
+
 	/***************************************************************************
 	 * 
 	 */
@@ -54,10 +69,7 @@ struct PackageConfig
 		auto buildPlatform = compilerData.determinePlatform(buildSettings, compiler, archType);
 
 		GeneratorSettings settings;
-		if (pkg)
-			settings.config = pkg.getDefaultConfiguration(buildPlatform);
-		else
-			settings.config = dub.project.getDefaultConfiguration(buildPlatform);
+		settings.config    = determineConfigName(pkg ? pkg : dub.project.rootPackage, buildPlatform, configName);
 		settings.force     = true;
 		settings.buildType = buildType;
 		settings.compiler  = compilerData;
@@ -138,6 +150,33 @@ struct PackageConfig
 			cfg.loadPackage("testcases/case002", "x86_64", "debug", null, compiler);
 		}
 	}
+
+	@system unittest
+	{
+		import std.file;
+		import std.path;
+		import std.algorithm;
+		import std.array;
+		if ("testcases/issue32".exists)
+		{
+			PackageConfig cfg;
+			string compiler;
+			cfg.loadPackage("testcases/issue32", "x86_64", "debug", "valid", compiler);
+			assert(cfg.files.length == 1);
+			assert(cfg.subPackages.length == 1);
+			assert(cfg.subPackages[0].name == "issue32:subpkg");
+			assert(cfg.subPackages[0].files.length == 2);
+			assert(cfg.subPackages[0].files.map!(a => a.baseName).array.sort().equal(["foo.d", "lib.d"]));
+
+			cfg = PackageConfig.init;
+			cfg.loadPackage("testcases/issue32", "x86_64", "debug", null, compiler);
+			assert(cfg.files.length == 1);
+			assert(cfg.subPackages.length == 1);
+			assert(cfg.subPackages[0].name == "issue32:subpkg");
+			assert(cfg.subPackages[0].files.length == 2);
+			assert(cfg.subPackages[0].files.map!(a => a.baseName).array.sort().equal(["bar.d", "lib.d"]));
+		}
+	}
 }
 
 private string _getHomeDirectory()

diff --git a/testcases/issue32/.no_build b/testcases/issue32/.no_build
diff --git a/testcases/issue32/.no_test b/testcases/issue32/.no_test
diff --git a/testcases/issue32/.run_opts b/testcases/issue32/.run_opts
@@ -0,0 +1,19 @@
+[
+	{
+		"name": "normal",
+		"dubWorkDir": "${project_root}",
+		"workDir": "${test_dir}",
+		"args": [
+			"--config=valid",
+			"--root=${test_dir}"
+		]
+	},
+	{
+		"name": "default_gendoc",
+		"dubWorkDir": "${project_root}",
+		"workDir": "${test_dir}",
+		"args": [
+			"--root=${test_dir}"
+		]
+	}
+]
diff --git a/testcases/issue32/dub.json b/testcases/issue32/dub.json
@@ -0,0 +1,20 @@
+{
+	"name": "issue32",
+	"subPackages": [
+		"subpkg"
+	],
+	"configurations": [
+		{
+			"name": "default",
+			"versions": ["Hoge"]
+		},
+		{
+			"name": "valid",
+			"versions": ["Foo"]
+		},
+		{
+			"name": "gendoc",
+			"versions": ["Bar"]
+		}
+	]
+}
diff --git a/testcases/issue32/source/app.d b/testcases/issue32/source/app.d
@@ -0,0 +1,9 @@
+import std.stdio;
+
+version (Hoge)
+{
+	static assert(0, "The default configuration was selected.");
+}
+void main()
+{
+}
diff --git a/testcases/issue32/subpkg/dub.json b/testcases/issue32/subpkg/dub.json
@@ -0,0 +1,19 @@
+{
+	"name": "subpkg",
+	"configurations": [
+		{
+			"name": "default",
+			"versions": ["Hoge"]
+		},
+		{
+			"name": "valid",
+			"versions": ["Foo"],
+			"sourcePaths": ["source", "source_foo"]
+		},
+		{
+			"name": "gendoc",
+			"versions": ["Bar"],
+			"sourcePaths": ["source", "source_bar"]
+		}
+	]
+}
diff --git a/testcases/issue32/subpkg/source/lib.d b/testcases/issue32/subpkg/source/lib.d
@@ -0,0 +1,7 @@
+module lib;
+
+version (Hoge)
+	static assert(0, "The default configuration was selected.");
+void hoge()
+{
+}
diff --git a/testcases/issue32/subpkg/source_bar/bar.d b/testcases/issue32/subpkg/source_bar/bar.d
@@ -0,0 +1,6 @@
+module bar;
+
+void bar()
+{
+
+}
diff --git a/testcases/issue32/subpkg/source_foo/foo.d b/testcases/issue32/subpkg/source_foo/foo.d
@@ -0,0 +1,6 @@
+module foo;
+
+void foo()
+{
+
+}