bpo-34170: _PyCoreConfig_Read() defaults to argc=0 (GH-8595)

vstinner · web-flow · commit ea68d83933e6 · 2018-08-01T03:07:18.000+02:00
Add unit tests for argc and argv of _PyCoreConfig.
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -272,6 +272,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
 
         'pycache_prefix': '(null)',
         'program_name': './_testembed',
+        'argc': 0,
+        'argv': '[]',
         'program': '(null)',
 
         'isolated': 0,
diff --git a/Modules/main.c b/Modules/main.c
@@ -2294,6 +2294,9 @@ _PyCoreConfig_Read(_PyCoreConfig *config)
     if (config->_frozen < 0) {
         config->_frozen = 0;
     }
+    if (config->argc < 0) {
+        config->argc = 0;
+    }
 
     return _Py_INIT_OK();
 }
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -335,7 +335,17 @@ dump_config(void)
     printf("pycache_prefix = %ls\n", config->pycache_prefix);
     printf("program_name = %ls\n", config->program_name);
     ASSERT_STR_EQUAL(config->program_name, Py_GetProgramName());
-    /* FIXME: test argc/argv */
+
+    printf("argc = %i\n", config->argc);
+    printf("argv = [");
+    for (int i=0; i < config->argc; i++) {
+        if (i) {
+            printf(", ");
+        }
+        printf("\"%ls\"", config->argv[i]);
+    }
+    printf("]\n");
+
     printf("program = %ls\n", config->program);
     /* FIXME: test xoptions */
     /* FIXME: test warnoptions */

Original file line number	Diff line number	Diff line change
`@@ -2294,6 +2294,9 @@ _PyCoreConfig_Read(_PyCoreConfig *config)`
`2294`	`2294`	`if (config->_frozen < 0) {`
`2295`	`2295`	`config->_frozen = 0;`
`2296`	`2296`	`}`
	`2297`	`+ if (config->argc < 0) {`
	`2298`	`+ config->argc = 0;`
	`2299`	`+ }`
`2297`	`2300`
`2298`	`2301`	`return _Py_INIT_OK();`
`2299`	`2302`	`}`