Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
81b3dd65
Commit
81b3dd65
authored
Jan 27, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://git.varnish-cache.org/git/varnish-cache
parents
eb9eca8c
0506b118
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
43 deletions
+4
-43
vtc_main.c
bin/varnishtest/vtc_main.c
+1
-21
varnish.spec
redhat/varnish.spec
+3
-22
No files found.
bin/varnishtest/vtc_main.c
View file @
81b3dd65
...
...
@@ -42,11 +42,6 @@ SVNID("$Id$")
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <pwd.h>
#ifdef __linux__
#include <sys/prctl.h>
#endif
#include "libvarnish.h"
#include "vev.h"
...
...
@@ -251,7 +246,7 @@ start_test(void)
srandomdev
();
bprintf
(
tmpdir
,
"/tmp/vtc.%d.%08x"
,
getpid
(),
(
unsigned
)
random
());
AZ
(
mkdir
(
tmpdir
,
07
00
));
AZ
(
mkdir
(
tmpdir
,
07
11
));
tp
=
VTAILQ_FIRST
(
&
tst_head
);
CHECK_OBJ_NOTNULL
(
tp
,
TST_MAGIC
);
...
...
@@ -369,21 +364,6 @@ main(int argc, char * const *argv)
vb
=
vev_new_base
();
if
(
geteuid
()
==
0
)
{
struct
passwd
*
pw
;
pw
=
getpwnam
(
"nobody"
);
assert
(
setgid
(
pw
->
pw_gid
)
==
0
);
assert
(
setuid
(
pw
->
pw_uid
)
==
0
);
/* On Linux >= 2.4, you need to set the dumpable flag
to get core dumps after you have done a setuid. */
#ifdef __linux__
if
(
prctl
(
PR_SET_DUMPABLE
,
1
)
!=
0
)
{
printf
(
"Could not set dumpable bit. Core dumps turned "
"off
\n
"
);
}
#endif
}
i
=
0
;
while
(
!
VTAILQ_EMPTY
(
&
tst_head
)
||
i
)
{
if
(
!
VTAILQ_EMPTY
(
&
tst_head
)
&&
njob
<
npar
)
{
...
...
redhat/varnish.spec
View file @
81b3dd65
...
...
@@ -75,22 +75,7 @@ Documentation files for %name
# The svn sources needs to generate a suitable configure script
# Release tarballs would not need this
./autogen.sh
# Hack to get 32- and 64-bits tests run concurrently on the same build machine
case `uname -m` in
ppc64 | s390x | x86_64 | sparc64 )
sed -i '
s,9001,9011,g;
s,9080,9090,g;
s,9081,9091,g;
s,9082,9092,g;
s,9180,9190,g;
' bin/varnishtest/*.c bin/varnishtest/tests/*vtc
;;
*)
;;
esac
#./autogen.sh
mkdir examples
cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
...
...
@@ -141,12 +126,7 @@ tail -n +11 etc/default.vcl >> redhat/default.vcl
redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
%endif
%if 0%{?rhel} > 4 || 0%{?fedora} > 6
pushd doc/sphinx
%{__make} html
popd
mv doc/sphinx/\=build/html doc
%endif
cp -r doc/sphinx/\=build/html doc
%check
# rhel5 on ppc64 is just too strange
...
...
@@ -195,6 +175,7 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_sbindir}/*
%{_bindir}/*
%{_libdir}/varnish
%{_var}/lib/varnish
%{_var}/log/varnish
%{_mandir}/man1/*.1*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment