Merge pull request #2375 from CyberShadow/issue19433

Fix Issue 19433 - Don't consume --DRT-* options if rt_cmdline_enabled is false
merged-on-behalf-of: Rainer Schuetze <rainers@users.noreply.github.com>

Author: dlang-bot

posix.mak

@@ -253,7 +253,7 @@ HAS_ADDITIONAL_TESTS:=$(shell test -d test && echo 1)
 ifeq ($(HAS_ADDITIONAL_TESTS),1)
 	ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles test/allocations test/typeinfo \
 	    test/aa test/hash \
-	    test/thread test/unittest test/imports test/betterc test/stdcpp
+	    test/thread test/unittest test/imports test/betterc test/stdcpp test/config
 	ADDITIONAL_TESTS+=$(if $(SHARED),test/shared,)
 endif
 

src/rt/config.d

@@ -4,8 +4,9 @@ Configuration options for druntime.
 The default way to configure the runtime is by passing command line arguments
 starting with `--DRT-` and followed by the option name, e.g. `--DRT-gcopt` to
 configure the GC.
-Command line options starting with `--DRT-` are filtered out before calling main,
-so the program will not see them. They are still available via `rt_args()`.
+When command line parsing is enabled, command line options starting
+with `--DRT-` are filtered out before calling main, so the program
+will not see them. They are still available via `rt_args()`.
 
 Configuration via the command line can be disabled by declaring a variable for the
 linker to pick up before using it's default from the runtime:

src/rt/dmain2.d

@@ -443,7 +443,9 @@ extern (C) int _d_run_main(int argc, char **argv, MainFunc mainFunc)
         size_t j = 0;
         foreach (arg; args)
         {
-            if (arg.length < 6 || arg[0..6] != "--DRT-") // skip D runtime options
+            import rt.config : rt_cmdline_enabled;
+
+            if (!rt_cmdline_enabled!() || arg.length < 6 || arg[0..6] != "--DRT-") // skip D runtime options
             {
                 argsCopy[j++] = (argBuff[0 .. arg.length] = arg[]);
                 argBuff += arg.length;

test/config/Makefile

@@ -0,0 +1,17 @@
+include ../common.mak
+
+TESTS:=test19433
+
+.PHONY: all clean
+all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))
+
+$(ROOT)/%: $(SRC)/%.d
+	$(QUIET)$(DMD) $(DFLAGS) -of$@ $<
+
+$(ROOT)/test19433.done: $(ROOT)/test19433
+	@echo Testing test19433
+	$(QUIET)$(ROOT)/test19433 --DRT-dont-eat-me
+	@touch $@
+
+clean:
+	rm -rf $(ROOT)

test/config/src/test19433.d

@@ -0,0 +1,7 @@
+extern(C) __gshared bool rt_cmdline_enabled = false;
+
+void main(string[] args)
+{
+    assert(args.length == 2);
+    assert(args[1] == "--DRT-dont-eat-me");
+}

test/exceptions/Makefile

@@ -63,7 +63,7 @@ $(ROOT)/rt_trap_exceptions.done: STDERR_EXP2="src/rt_trap_exceptions.d:8 main"
 $(ROOT)/%.done: $(ROOT)/%
 	@echo Testing $*
 	$(NEGATE) $(QUIET)$(TIMELIMIT)$(ROOT)/$* $(RUN_ARGS) 2>&1 1>/dev/null | grep -qF $(STDERR_EXP)
-	if [ ! -z "$(STDERR_EXP2)" ] ; then \
+	if [ ! -z $(STDERR_EXP2) ] ; then \
 		$(NEGATE) $(QUIET)$(TIMELIMIT)$(ROOT)/$* $(RUN_ARGS) 2>&1 1>/dev/null | grep -qF $(STDERR_EXP2); \
 	fi
 	@touch $@
@@ -75,7 +75,7 @@ $(ROOT)/rt_trap_exceptions_drt.done: NEGATE=!
 
 $(ROOT)/rt_trap_exceptions_drt_gdb.done: $(ROOT)/rt_trap_exceptions_drt
 	@echo Testing rt_trap_exceptions_drt_gdb
-	$(QUIET)$(TIMELIMIT) $(GDB) -ex run -ex 'bt full' -ex q --args $< --DRT-trapExceptions=0 \
+	$(QUIET)$(TIMELIMIT) $(GDB) -ex 'set confirm off' -ex run -ex 'bt full' -ex q --args $< --DRT-trapExceptions=0 \
 		> $(ROOT)/rt_trap_exceptions_drt_gdb.output 2>&1 || true
 	cat $(ROOT)/rt_trap_exceptions_drt_gdb.output
 	grep "in D main (args=...) at src/rt_trap_exceptions_drt.d:9" > /dev/null < $(ROOT)/rt_trap_exceptions_drt_gdb.output