Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb8f611c

Browse files
author
Michael Meskes
committed
Simplified regression handling
Added patch by Joachim to work around OpenBSD bug in regression suite.
1 parent97903c3 commitb8f611c

File tree

46 files changed

+66
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+66
-70
lines changed

‎src/interfaces/ecpg/ecpglib/connect.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.38 2007/01/11 15:47:33 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.39 2007/01/12 10:00:12 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -19,7 +19,6 @@ static pthread_once_t actual_connection_key_once = PTHREAD_ONCE_INIT;
1919
#endif
2020
staticstructconnection*actual_connection=NULL;
2121
staticstructconnection*all_connections=NULL;
22-
externintecpg_internal_regression_mode;
2322

2423
#ifdefENABLE_THREAD_SAFETY
2524
staticvoid

‎src/interfaces/ecpg/ecpglib/data.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.36 2007/01/11 15:47:33 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.37 2007/01/12 10:00:12 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -16,8 +16,6 @@
1616
#include"pgtypes_timestamp.h"
1717
#include"pgtypes_interval.h"
1818

19-
externintecpg_internal_regression_mode;
20-
2119
staticbool
2220
garbage_left(enumARRAY_TYPEisarray,char*scan_length,enumCOMPAT_MODEcompat)
2321
{

‎src/interfaces/ecpg/ecpglib/extern.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/extern.h,v 1.20 2006/10/0400:30:11 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/extern.h,v 1.21 2007/01/12 10:00:13 meskes Exp $ */
22

33
#ifndef_ECPG_LIB_EXTERN_H
44
#define_ECPG_LIB_EXTERN_H
@@ -12,6 +12,8 @@ enum COMPAT_MODE
1212
ECPG_COMPAT_PGSQL=0,ECPG_COMPAT_INFORMIX,ECPG_COMPAT_INFORMIX_SE
1313
};
1414

15+
externboolecpg_internal_regression_mode;
16+
1517
#defineINFORMIX_MODE(X) ((X) == ECPG_COMPAT_INFORMIX || (X) == ECPG_COMPAT_INFORMIX_SE)
1618

1719
enumARRAY_TYPE

‎src/interfaces/ecpg/ecpglib/misc.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.33 2007/01/11 15:47:33 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.34 2007/01/12 10:00:13 meskes Exp $ */
22

33
#definePOSTGRES_ECPG_INTERNAL
44
#include"postgres_fe.h"
@@ -28,7 +28,7 @@
2828
#endif
2929
#endif
3030

31-
externintecpg_internal_regression_mode;
31+
boolecpg_internal_regression_mode= false;
3232

3333
staticstructsqlca_tsqlca_init=
3434
{
@@ -228,8 +228,16 @@ ECPGdebug(int n, FILE *dbgs)
228228
pthread_mutex_lock(&debug_init_mutex);
229229
#endif
230230

231-
simple_debug=n;
231+
if (n>100)
232+
{
233+
ecpg_internal_regression_mode= true;
234+
simple_debug=n-100;
235+
}
236+
else
237+
simple_debug=n;
238+
232239
debugstream=dbgs;
240+
233241
ECPGlog("ECPGdebug: set to %d\n",simple_debug);
234242

235243
#ifdefENABLE_THREAD_SAFETY

‎src/interfaces/ecpg/preproc/ecpg.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.95 2007/01/11 15:47:33 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.96 2007/01/12 10:00:13 meskes Exp $ */
22

33
/* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
44
/* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@@ -425,7 +425,6 @@ main(int argc, char *const argv[])
425425
else
426426
fprintf(yyout,"/* Processed by ecpg (%d.%d.%d) */\n",MAJOR_VERSION,MINOR_VERSION,PATCHLEVEL);
427427

428-
fprintf(yyout,"int ecpg_internal_regression_mode = %d;\n",regression_mode);
429428
if (header_mode== false)
430429
{
431430
fprintf(yyout,"/* These include files are added by the preprocessor */\n#include <ecpgtype.h>\n#include <ecpglib.h>\n#include <ecpgerrno.h>\n#include <sqlca.h>\n");
@@ -437,6 +436,9 @@ main(int argc, char *const argv[])
437436
fprintf(yyout,"/* End of automatic include section */\n");
438437
}
439438

439+
if (regression_mode)
440+
fprintf(yyout,"#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))\n");
441+
440442
output_line_number();
441443

442444
/* and parse the source */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "charfuncs.pgc"
1313
#include<stdio.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "dec_test.pgc"
1313
#include<stdio.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "rfmtdate.pgc"
1313
#include<stdio.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "rfmtlong.pgc"
1313
#include<stdio.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "rnull.pgc"
1313
#include"sqltypes.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "test_informix.pgc"
1313
#include"sqltypes.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
@@ -8,6 +7,7 @@ int ecpg_internal_regression_mode = 1;
87
/* Needed for informix compatibility */
98
#include<ecpg_informix.h>
109
/* End of automatic include section */
10+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
1111

1212
#line 1 "test_informix2.pgc"
1313
#include<stdio.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "test1.pgc"
1111
/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "test2.pgc"
1111
/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "test3.pgc"
1111
/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "test4.pgc"
1111
#include<stdlib.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "test5.pgc"
1111
/*

‎src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "dt_test.pgc"
1111
#include<stdio.h>

‎src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "dt_test2.pgc"
1111
#include<stdio.h>

‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "num_test.pgc"
1111
#include<stdio.h>

‎src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "num_test2.pgc"
1111
#include<stdio.h>

‎src/interfaces/ecpg/test/expected/preproc-comment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "comment.pgc"
1111
#include<stdlib.h>

‎src/interfaces/ecpg/test/expected/preproc-define.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "define.pgc"
1111
#include<stdlib.h>

‎src/interfaces/ecpg/test/expected/preproc-init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "init.pgc"
1111

‎src/interfaces/ecpg/test/expected/preproc-type.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "type.pgc"
1111
#include<stdio.h>

‎src/interfaces/ecpg/test/expected/preproc-variable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "variable.pgc"
1111
#include<stdlib.h>

‎src/interfaces/ecpg/test/expected/preproc-whenever.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Processed by ecpg (regression mode) */
2-
intecpg_internal_regression_mode=1;
32
/* These include files are added by the preprocessor */
43
#include<ecpgtype.h>
54
#include<ecpglib.h>
65
#include<ecpgerrno.h>
76
#include<sqlca.h>
87
/* End of automatic include section */
8+
#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
99

1010
#line 1 "whenever.pgc"
1111
#include<stdlib.h>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp