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

Commit43499af

Browse files
Jan WieckJan Wieck
Jan Wieck
authored and
Jan Wieck
committed
New parallel regression test shell and related things.
Jan
1 parent58d1eea commit43499af

File tree

8 files changed

+1441
-849
lines changed

8 files changed

+1441
-849
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.7 1999/10/25 03:07:42 tgl Exp $
8+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.8 1999/11/19 18:51:47 wieck Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -1253,15 +1253,15 @@ StartupXLOG()
12531253
{
12541254
fd=errno;
12551255
if (!ReleaseDataFile())
1256-
elog(STOP,"Open(cntlfile) failed: %d (and no one data file can be closed)",
1257-
fd);
1256+
elog(STOP,"Open(\"%s\") failed: %d (and no one data file can be closed)",
1257+
ControlFilePath,fd);
12581258
gototryAgain;
12591259
}
12601260
if (fd<0)
1261-
elog(STOP,"Open(cntlfile) failed: %d",errno);
1261+
elog(STOP,"Open(\"%s\") failed: %d",ControlFilePath,errno);
12621262

12631263
if (read(fd,ControlFile,BLCKSZ)!=BLCKSZ)
1264-
elog(STOP,"Read(cntlfile) failed: %d",errno);
1264+
elog(STOP,"Read(\"%s\") failed: %d",ControlFilePath,errno);
12651265

12661266
close(fd);
12671267

‎src/backend/utils/cache/catcache.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.51 1999/11/07 23:08:26 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.52 1999/11/19 18:51:48 wieck Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -983,11 +983,23 @@ SearchSysCache(struct catcache * cache,
983983
* ----------------
984984
*/
985985

986+
/* ----------
987+
* It is definitely insufficient. While modifying the regression
988+
* test to run independent tests concurrently it happened, that
989+
* this code fails VERY often. ISTM that 'cache' points into
990+
* shared memory, but that 'busy' means this backend is loading
991+
* a new entry. So when another backend has set busy, this one
992+
* think's it detected a recursion.
993+
*
994+
* Need's a smarter detection mechanism - Jan
995+
*
986996
if (cache->busy)
987997
{
988998
elog(ERROR, "SearchSysCache: recursive use of cache %d", cache->id);
989999
}
9901000
cache->busy = true;
1001+
* ----------
1002+
*/
9911003

9921004
/* ----------------
9931005
*open the relation associated with the cache

‎src/test/regress/GNUmakefile

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.19 1999/06/28 18:40:34 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.20 1999/11/19 18:51:48 wieck Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -91,6 +91,38 @@ else
9191
endif
9292
@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
9393

94+
#
95+
# run the parallel test suite
96+
#
97+
runcheck:$(INFILES)
98+
ifneq ($(PORTNAME), win)
99+
MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
100+
$(SHELL) ./run_check.sh $(PORTNAME)
101+
else
102+
MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
103+
./run_check.sh $(PORTNAME)
104+
endif
105+
@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out"
106+
@echo "AND regress.out"
107+
@echo ""
108+
@echo "To run the optional big test(s) too, type 'make bigcheck'"
109+
@echo "These big tests can take over an hour to complete"
110+
@echo "These actually are: $(EXTRA_TESTS)"
111+
112+
#
113+
# run the test including the huge extra tests
114+
#
115+
bigcheck:$(INFILES)
116+
ifneq ($(PORTNAME), win)
117+
MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
118+
$(SHELL) ./run_check.sh $(PORTNAME) $(EXTRA_TESTS)
119+
else
120+
MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
121+
./run_check.sh $(PORTNAME) $(EXTRA_TESTS)
122+
endif
123+
@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out"
124+
@echo "AND regress.out"
125+
94126
clean:
95127
rm -f$(INFILES) regress.out regress.o regression.diffs
96128
ifeq ($(PORTNAME), win)
@@ -100,3 +132,4 @@ endif
100132
$(MAKE) -C expected clean
101133
$(MAKE) -C results clean
102134
$(MAKE) -C ../../../contrib/spi clean
135+
rm -rf tmp_check

‎src/test/regress/expected/numeric.out

Lines changed: 408 additions & 418 deletions
Large diffs are not rendered by default.

‎src/test/regress/regress.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.31 1999/07/09 17:57:46 momjian Exp $
2+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.32 1999/11/19 18:51:49 wieck Exp $
33
#
44
if [$#-eq 0 ]
55
then
@@ -76,7 +76,13 @@ fi
7676

7777
echo"=============== running regression queries... ================="
7878
echo""> regression.diffs
79-
foriin`cat sql/tests`$mbtests$extratests
79+
80+
stdtests=`awk'
81+
$1=="test"{ print $2; }
82+
{}
83+
'< sql/run_check.tests`
84+
85+
foriin$stdtests$mbtests$extratests
8086
do
8187
$ECHO_N"${i} .."$ECHO_C
8288
$FRONTEND regression< sql/${i}.sql> results/${i}.out2>&1

0 commit comments

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