NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb1907d6

committed

Set application_name per-test in isolation and ecpg tests.

Commita432729 taught pg_regress proper to do this, butmissed the opportunity to do likewise in the isolationtesterand ecpg variants of pg_regress. Seems like this might behelpful for tracking down issues exposed by those tests.

1 parent458f01e commitb1907d6Copy full SHA for b1907d6

File tree

3 files changed

+19

-0

lines changed

src
- interfaces/ecpg/test
  - pg_regress_ecpg.c
- test
  - isolation
    - isolation_main.c
  - regress
    - pg_regress.c

3 files changed

+19

-0

lines changed

`‎src/interfaces/ecpg/test/pg_regress_ecpg.c`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ ecpg_start_test(const char *testname,`
`95`	`95`	`expectfile_source[MAXPGPATH];`
`96`	`96`	`charcmd[MAXPGPATH*3];`
`97`	`97`	`char*testname_dash;`
	`98`	`+char*appnameenv;`
`98`	`99`
`99`	`100`	`snprintf(inprg,sizeof(inprg),"%s/%s",inputdir,testname);`
`100`	`101`
`@@ -144,6 +145,9 @@ ecpg_start_test(const char *testname,`
`144`	`145`	`outfile_stdout,`
`145`	`146`	`outfile_stderr);`
`146`	`147`
	`148`	`+appnameenv=psprintf("PGAPPNAME=ecpg/%s",testname_dash);`
	`149`	`+putenv(appnameenv);`
	`150`	`+`
`147`	`151`	`pid=spawn_process(cmd);`
`148`	`152`
`149`	`153`	`if (pid==INVALID_PID)`
`@@ -153,6 +157,10 @@ ecpg_start_test(const char *testname,`
`153`	`157`	`exit(2);`
`154`	`158`	`}`
`155`	`159`
	`160`	`+unsetenv("PGAPPNAME");`
	`161`	`+free(appnameenv);`
	`162`	`+`
	`163`	`+free(testname_dash);`
`156`	`164`	`free(outfile_stdout);`
`157`	`165`	`free(outfile_stderr);`
`158`	`166`	`free(outfile_source);`

`‎src/test/isolation/isolation_main.c`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ isolation_start_test(const char *testname,`
`36`	`36`	`charexpectfile[MAXPGPATH];`
`37`	`37`	`charpsql_cmd[MAXPGPATH*3];`
`38`	`38`	`size_toffset=0;`
	`39`	`+char*appnameenv;`
`39`	`40`
`40`	`41`	`/* need to do the path lookup here, check isolation_init() for details */`
`41`	`42`	`if (!looked_up_isolation_exec)`
`@@ -97,6 +98,9 @@ isolation_start_test(const char *testname,`
`97`	`98`	`exit(2);`
`98`	`99`	`}`
`99`	`100`
	`101`	`+appnameenv=psprintf("PGAPPNAME=isolation/%s",testname);`
	`102`	`+putenv(appnameenv);`
	`103`	`+`
`100`	`104`	`pid=spawn_process(psql_cmd);`
`101`	`105`
`102`	`106`	`if (pid==INVALID_PID)`
`@@ -106,6 +110,9 @@ isolation_start_test(const char *testname,`
`106`	`110`	`exit(2);`
`107`	`111`	`}`
`108`	`112`
	`113`	`+unsetenv("PGAPPNAME");`
	`114`	`+free(appnameenv);`
	`115`	`+`
`109`	`116`	`returnpid;`
`110`	`117`	`}`
`111`	`118`

`‎src/test/regress/pg_regress.c`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -726,6 +726,10 @@ doputenv(const char var, const char val)`
`726`	`726`	`staticvoid`
`727`	`727`	`initialize_environment(void)`
`728`	`728`	`{`
	`729`	`+/*`
	`730`	`+ * Set default application_name. (The test_function may choose to`
	`731`	`+ * override this, but if it doesn't, we have something useful in place.)`
	`732`	`+ */`
`729`	`733`	`putenv("PGAPPNAME=pg_regress");`
`730`	`734`
`731`	`735`	`if (nolocale)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb1907d6

File tree

3 files changed

3 files changed

`‎src/interfaces/ecpg/test/pg_regress_ecpg.c`

`‎src/test/isolation/isolation_main.c`

`‎src/test/regress/pg_regress.c`

0 commit comments