Skip to content

Commit 67135eb

Browse files
author
Michael Meskes
committed
Removed debug option from pg_regress call.
Changed file paths in expected files too.
1 parent b171033 commit 67135eb

31 files changed

+58
-58
lines changed

‎src/interfaces/ecpg/test/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.59 2006/08/28 16:13:11 tgl Exp $
1+
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.60 2006/08/29 12:33:45 meskes Exp $
22

33
subdir = src/interfaces/ecpg/test
44
top_builddir = ../../../..
@@ -76,11 +76,11 @@ endif
7676

7777

7878
check: all
79-
sh ./pg_regress --dbname=regress1 --debug --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
79+
sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
8080

8181
# the same options, but with --listen-on-tcp
8282
checktcp: all
83-
sh ./pg_regress --dbname=regress1 --debug --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) --listen-on-tcp
83+
sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) --listen-on-tcp
8484

8585
installcheck: all
86-
sh ./pg_regress --dbname=regress1 --debug --top-builddir=$(top_builddir) --load-language=plpgsql $(NOLOCALE)
86+
sh ./pg_regress --dbname=regress1 --top-builddir=$(top_builddir) --load-language=plpgsql $(NOLOCALE)

‎src/interfaces/ecpg/test/expected/compat_informix-dec_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <sqltypes.h>
1818

1919

20-
#line 1 "regression.h"
20+
#line 1 "./../regression.h"
2121

2222

2323

‎src/interfaces/ecpg/test/expected/compat_informix-rnull.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <stdlib.h>
1414
#
1515

16-
#line 1 "regression.h"
16+
#line 1 "./../regression.h"
1717

1818

1919

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <stdlib.h>
1414
#
1515

16-
#line 1 "regression.h"
16+
#line 1 "./../regression.h"
1717

1818

1919

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "sqltypes.h"
1515

1616

17-
#line 1 "sqlca.h"
17+
#line 1 "./../../include/sqlca.h"
1818
#ifndef POSTGRES_SQLCA_H
1919
#define POSTGRES_SQLCA_H
2020

@@ -85,7 +85,7 @@ struct sqlca_t *ECPGget_sqlca(void);
8585
#line 5 "test_informix2.pgc"
8686

8787

88-
#line 1 "regression.h"
88+
#line 1 "./../regression.h"
8989

9090

9191

‎src/interfaces/ecpg/test/expected/complex-test1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <stdio.h>
1414

1515

16-
#line 1 "regression.h"
16+
#line 1 "./../regression.h"
1717

1818

1919

‎src/interfaces/ecpg/test/expected/complex-test2.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <string.h>
1212

1313

14-
#line 1 "header_test.h"
14+
#line 1 "./header_test.h"
1515
#include "stdlib.h"
1616

1717
static void
@@ -22,19 +22,19 @@ Finish(char *msg)
2222

2323
/* finish transaction */
2424
{ ECPGtrans(__LINE__, NULL, "rollback");}
25-
#line 10 "header_test.h"
25+
#line 10 "./header_test.h"
2626

2727

2828
/* and remove test table */
2929
{ ECPGdo(__LINE__, 0, 1, NULL, "drop table meskes ", ECPGt_EOIT, ECPGt_EORT);}
30-
#line 13 "header_test.h"
30+
#line 13 "./header_test.h"
3131

3232
{ ECPGtrans(__LINE__, NULL, "commit");}
33-
#line 14 "header_test.h"
33+
#line 14 "./header_test.h"
3434

3535

3636
{ ECPGdisconnect(__LINE__, "CURRENT");}
37-
#line 16 "header_test.h"
37+
#line 16 "./header_test.h"
3838

3939

4040
exit(-1);
@@ -47,16 +47,16 @@ warn(void)
4747
}
4848

4949
/* exec sql whenever sqlerror do Finish ( msg ) ; */
50-
#line 29 "header_test.h"
50+
#line 29 "./header_test.h"
5151

5252
/* exec sql whenever sql_warning do warn ( ) ; */
53-
#line 32 "header_test.h"
53+
#line 32 "./header_test.h"
5454

5555

5656
#line 4 "test2.pgc"
5757

5858

59-
#line 1 "regression.h"
59+
#line 1 "./../regression.h"
6060

6161

6262

‎src/interfaces/ecpg/test/expected/complex-test3.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/* Test comment */
1212
/*--------------------------------------------------------------------------*/
1313

14-
#line 1 "header_test.h"
14+
#line 1 "./header_test.h"
1515
#include "stdlib.h"
1616

1717
static void
@@ -22,19 +22,19 @@ Finish(char *msg)
2222

2323
/* finish transaction */
2424
{ ECPGtrans(__LINE__, NULL, "rollback");}
25-
#line 10 "header_test.h"
25+
#line 10 "./header_test.h"
2626

2727

2828
/* and remove test table */
2929
{ ECPGdo(__LINE__, 0, 1, NULL, "drop table meskes ", ECPGt_EOIT, ECPGt_EORT);}
30-
#line 13 "header_test.h"
30+
#line 13 "./header_test.h"
3131

3232
{ ECPGtrans(__LINE__, NULL, "commit");}
33-
#line 14 "header_test.h"
33+
#line 14 "./header_test.h"
3434

3535

3636
{ ECPGdisconnect(__LINE__, "CURRENT");}
37-
#line 16 "header_test.h"
37+
#line 16 "./header_test.h"
3838

3939

4040
exit(-1);
@@ -47,16 +47,16 @@ warn(void)
4747
}
4848

4949
/* exec sql whenever sqlerror do Finish ( msg ) ; */
50-
#line 29 "header_test.h"
50+
#line 29 "./header_test.h"
5151

5252
/* exec sql whenever sql_warning do warn ( ) ; */
53-
#line 32 "header_test.h"
53+
#line 32 "./header_test.h"
5454

5555

5656
#line 4 "test3.pgc"
5757

5858

59-
#line 1 "regression.h"
59+
#line 1 "./../regression.h"
6060

6161

6262

‎src/interfaces/ecpg/test/expected/complex-test4.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818

19-
#line 1 "sqlca.h"
19+
#line 1 "./../../include/sqlca.h"
2020
#ifndef POSTGRES_SQLCA_H
2121
#define POSTGRES_SQLCA_H
2222

@@ -87,7 +87,7 @@ struct sqlca_t *ECPGget_sqlca(void);
8787
#line 7 "test4.pgc"
8888

8989

90-
#line 1 "regression.h"
90+
#line 1 "./../regression.h"
9191

9292

9393

‎src/interfaces/ecpg/test/expected/complex-test5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <stdlib.h>
1212

1313

14-
#line 1 "regression.h"
14+
#line 1 "./../regression.h"
1515

1616

1717

0 commit comments

Comments
 (0)