Merge remote branch 'origin/master' into edge

automatic-merge · automatic-merge · commit c20928fb649c · 2025-06-27T00:55:16.000Z
diff --git a/Makefile b/Makefile
@@ -32,14 +32,9 @@ clean:
 build-tests:
 	gprbuild -j0 -p -P gnat/tests/test_drivers.gpr ${SCENARIO_VARIABLES}
 
-check: build-tests check_extractor check_gnatdoc
-
-check_extractor:
+check: build-tests
 	make -C testsuite
 
-check_gnatdoc:
-	make -C testsuite/gnatdoc.RB16-013.gpr_tool
-
 build-documentation:
 	make -C documentation/users_guide html latexpdf
 
diff --git a/source/gnatdoc/gnatdoc-projects.adb b/source/gnatdoc/gnatdoc-projects.adb
@@ -269,7 +269,8 @@ package body GNATdoc.Projects is
          Opt.Add_Switch
            (GPR2.Options.P,
             VSS.Strings.Conversions.To_UTF_8_String
-             (GNATdoc.Command_Line.Project_File));
+              (GNATdoc.Command_Line.Project_File));
+         Opt.Add_Context (Project_Context);
 
          if not Project_Tree.Load (Opt, With_Runtime => True) then
             Msgs := Messages;
diff --git a/testsuite/executable/RB16-013.gpr_tool/default.gpr b/testsuite/executable/RB16-013.gpr_tool/default.gpr
@@ -1,5 +1,5 @@
 
-project Test is
+project Default is
 
    Tool := external ("GPR_TOOL", "");
 
@@ -11,4 +11,4 @@ project Test is
          for Object_Dir use ".objs";
    end case;
 
-end Test;
+end Default;
diff --git a/testsuite/executable/RB16-013.gpr_tool/p.ads b/testsuite/executable/RB16-013.gpr_tool/p.ads
diff --git a/testsuite/executable/RB16-013.gpr_tool/test.out b/testsuite/executable/RB16-013.gpr_tool/test.out
@@ -0,0 +1,2 @@
+default.gpr:8:29: warning: object directory ".docs" not found
+default.gpr:8:29: warning: object directory ".docs" not found
diff --git a/testsuite/executable/RB16-013.gpr_tool/test.sh b/testsuite/executable/RB16-013.gpr_tool/test.sh
@@ -0,0 +1 @@
+$GNATDOC4 default.gpr
diff --git a/testsuite/executable/RB16-013.gpr_tool/test.yaml b/testsuite/executable/RB16-013.gpr_tool/test.yaml
@@ -0,0 +1,2 @@
+description: Check setting of GPR_TOOL scenario variable
+driver: executable
diff --git a/testsuite/gnatdoc.RB16-013.gpr_tool/Makefile b/testsuite/gnatdoc.RB16-013.gpr_tool/Makefile

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+default.gpr:8:29: warning: object directory ".docs" not found`
	`2`	`+default.gpr:8:29: warning: object directory ".docs" not found`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+description: Check setting of GPR_TOOL scenario variable`
	`2`	`+driver: executable`