* [xen-unstable test] 13934: regressions - FAIL
@ 2012-10-08 19:55 xen.org
2012-10-09 7:50 ` Ian Campbell
0 siblings, 1 reply; 10+ messages in thread
From: xen.org @ 2012-10-08 19:55 UTC (permalink / raw)
To: xen-devel; +Cc: ian.jackson
flight 13934 xen-unstable real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/13934/
Regressions :-(
Tests which did not succeed and are blocking,
including tests which could not be run:
build-i386-oldkern 4 xen-build fail REGR. vs. 13932
build-i386 4 xen-build fail REGR. vs. 13932
test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail REGR. vs. 13932
Regressions which are regarded as allowable (not blocking):
test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 13932
test-amd64-amd64-xl-sedf 5 xen-boot fail like 13932
test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 13932
Tests which did not succeed, but are not blocking:
test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a
test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a
test-amd64-i386-xl 1 xen-build-check(1) blocked n/a
test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a
test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a
test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a
test-amd64-amd64-win 16 leak-check/check fail never pass
test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a
test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a
test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass
test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a
test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a
test-amd64-i386-pv 1 xen-build-check(1) blocked n/a
test-amd64-i386-win 1 xen-build-check(1) blocked n/a
test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a
test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a
test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass
test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass
test-amd64-i386-pair 1 xen-build-check(1) blocked n/a
test-amd64-amd64-xl-win 13 guest-stop fail never pass
version targeted for testing:
xen c9f621893a05
baseline version:
xen 099589002239
------------------------------------------------------------
People who touched revisions under test:
Anthony PERARD <anthony.perard@citrix.com>
Ian Campbell <ian.campbell@citrix.com>
Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Olaf Hering <olaf@aepfle.de>
Roger Pau Monne <roger.pau@citrix.com>
Samuel Thibault <samuel.thibault@ens-lyons.org>
------------------------------------------------------------
jobs:
build-amd64 pass
build-i386 fail
build-amd64-oldkern pass
build-i386-oldkern fail
build-amd64-pvops pass
build-i386-pvops pass
test-amd64-amd64-xl pass
test-amd64-i386-xl blocked
test-amd64-i386-rhel6hvm-amd blocked
test-amd64-i386-qemuu-rhel6hvm-amd blocked
test-amd64-amd64-xl-qemuu-win7-amd64 fail
test-amd64-amd64-xl-win7-amd64 fail
test-amd64-i386-xl-win7-amd64 blocked
test-amd64-i386-xl-credit2 blocked
test-amd64-amd64-xl-pcipt-intel fail
test-amd64-i386-rhel6hvm-intel blocked
test-amd64-i386-qemuu-rhel6hvm-intel blocked
test-amd64-i386-xl-multivcpu blocked
test-amd64-amd64-pair pass
test-amd64-i386-pair blocked
test-amd64-amd64-xl-sedf-pin fail
test-amd64-amd64-pv pass
test-amd64-i386-pv blocked
test-amd64-amd64-xl-sedf fail
test-amd64-i386-win-vcpus1 blocked
test-amd64-i386-xl-win-vcpus1 blocked
test-amd64-i386-xl-winxpsp3-vcpus1 blocked
test-amd64-amd64-win fail
test-amd64-i386-win blocked
test-amd64-amd64-xl-win fail
test-amd64-amd64-xl-qemuu-winxpsp3 fail
test-amd64-i386-xend-winxpsp3 blocked
test-amd64-amd64-xl-winxpsp3 fail
------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images
Logs, config files, etc. are available at
http://www.chiark.greenend.org.uk/~xensrcts/logs
Test harness code can be found at
http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary
Not pushing.
------------------------------------------------------------
changeset: 26017:c9f621893a05
tag: tip
user: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
date: Mon Oct 08 14:36:31 2012 +0100
minios: setup fpu and sse in mini-os
This patch adds floating point and sse support to mini-os by
initializing the floating point unit and the see unit during
domain boot up.
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyons.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26016:865626fc7004
user: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
date: Mon Oct 08 14:36:31 2012 +0100
minios: add CONFIG_XC conditional
This patch adds a CONFIG_XC option to mini-os, to allow conditional
support for libxc for mini-os domains.
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyons.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26015:42ca0ed31aa6
user: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
date: Mon Oct 08 14:36:30 2012 +0100
minios: Disable the mfn_is_ram() check, it doesn't work correctly on all systems
This patch disables the mfn_is_ram check in mini-os. The current check
is insufficient and fails on some systems with larger than 4gb memory.
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyons.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26014:8fdb8d464ece
user: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
date: Mon Oct 08 14:36:29 2012 +0100
minios: Add endian, byteswap, and wordsize macros to mini-os
This patch addes byte swapping macros and endian support to mini-os.
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyons.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26013:a797d59e1d29
user: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
date: Mon Oct 08 14:36:28 2012 +0100
minios: Add ioread/iowrite functions to mini-os
This patch adds iowritexx() and ioreadxx() functions for interacting
with hardware memory to mini-os. The functions are available in a header
iorw.h
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyons.org>
Reviewed-by: George Dunlap <george.dunlap@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26012:02e744da52c9
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:35 2012 +0100
tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT
Upcoming changes may move DOCDIR from Config.mk to config/Tools.mk. To
preserve the currently used path, which ends with /xen, specify a value
for PACKAGE_TARNAME. Without this change the path would end with
/xen-hypervisor.
Please rerun autoconf after applying this.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26011:b6fb4e63b946
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:34 2012 +0100
stubdom: fix parallel build by expanding CROSS_MAKE
Recently I changed my rpm xen.spec file from doing
'make -C tools -j N && make stubdom' to 'make -j N stubdom' because
stubdom depends on tools, so both get built.
The result was the failure below.
....
mkdir -p grub-x86_64
CPPFLAGS="-isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../extras/mini-os/include -D__MINIOS__ -DHAVE_LIBC -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../extras/mini-os/include/posix -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../tools/xenstore -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../extras/mini-os/include/x86 -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../extras/mini-os/include/x86/x86_64 -U __linux__ -U __FreeBSD__ -U __sun__ -nostdinc -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../extras/mini-os/include/posix -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/cross-root-x86_64/x86_64-xen-elf/include -isystem /usr/lib64/gcc/x8
6_64-suse-linux/4.7/include -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/lwip-x86_64/src/include -isystem /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/lwip-x86_64/src/include/ipv4 -I/home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/include -I/home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../xen/include" CFLAGS="-mno-red-zone -O1 -fno-omit-frame-pointer -m64 -mno-red-zone -fno-reorder-blocks -fno-asynchronous-unwind-tables -m64 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement -Wno-unused-but-set-variable -fno-stack-protector -fno-exceptions" make DESTDIR= -C grub OBJ_DIR=/home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/grub-x86_64
make[2]: Entering directory `/home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/grub'
make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
make[2]: *** INTERNAL: readdir: Bad file descriptor
. Stop.
make[2]: Makefile: Field 'stem' not cached: Makefile
make[2]: Leaving directory `/home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/grub'
make[1]: *** [grub] Error 2
[ -d mini-os-x86_64-xenstore ] || \
for i in $(cd /home/abuild/rpmbuild/BUILD/xen-4.2.25602/non-dbg/stubdom/../extras/mini-os ; find . -type d) ; do \
mkdir -p mini-os-x86_64-xenstore/$i ; \
done
....
Expanding every occurrence of CROSS_MAKE avoids this error. It also has
the nice side effect of actually enabling parallel build for stubdom.
According to the GNU make documentation $(MAKE) gets its special meaning
only if it appears directly in the recipe:
http://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26010:cff10030c6ea
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:33 2012 +0100
xend/pvscsi: update sysfs parser for Linux 3.0
The sysfs parser for /sys/bus/scsi/devices understands only the layout
of kernel version 2.6.16. This looks as follows:
/sys/bus/scsi/devices/1:0:0:0/block:sda is a symlink to /sys/block/sda/
/sys/bus/scsi/devices/1:0:0:0/scsi_generic:sg1 is a symlink to /sys/class/scsi_generic/sg1
Both directories contain a 'dev' file with the major:minor information.
This patch updates the used regex strings to match also the colon to
make it more robust against possible future changes.
In kernel version 3.0 the layout changed:
/sys/bus/scsi/devices/ contains now additional symlinks to directories
such as host1 and target1:0:0. This patch ignores these as they do not
point to the desired scsi devices. They just clutter the devices array.
The directory layout in '1:0:0:0' changed as well, the 'type:name'
notation was replaced with 'type/name' directories:
/sys/bus/scsi/devices/1:0:0:0/block/sda/
/sys/bus/scsi/devices/1:0:0:0/scsi_generic/sg1/
Both directories contain a 'dev' file with the major:minor information.
This patch adds additional code to walk the subdir to find the 'dev'
file to make sure the given subdirectory is really the kernel name.
In addition this patch makes sure devname is not None.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26009:2dbfa4d2e107
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:32 2012 +0100
xend/pvscsi: fix usage of persistant device names for SCSI devices
Currently the callers of vscsi_get_scsidevices() do not pass a mask
string. This will call "lsscsi -g '[]'", which causes a lsscsi syntax
error. As a result the sysfs parser _vscsi_get_scsidevices() is used.
But this parser is broken and the specified names in the config file are
not found.
Using a mask '*' if no mask was given will call lsscsi correctly and the
following config is parsed correctly:
vscsi=[
'/dev/sg3, 0:0:0:0',
'/dev/disk/by-id/wwn-0x600508b4000cf1c30000800000410000, 0:0:0:1'
]
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26008:eecb528583d7
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:31 2012 +0100
xend/pvscsi: fix passing of SCSI control LUNs
Currently pvscsi can not pass SCSI devices that have just a scsi_generic node.
In the following example sg3 is a control LUN for the disk sdd.
But vscsi=['4:0:2:0,0:0:0:0'] does not work because the internal 'devname'
variable remains None. Later writing p-devname to xenstore fails because None
is not a valid string variable.
Since devname is used for just informational purpose use sg also as devname.
carron:~ $ lsscsi -g
[0:0:0:0] disk ATA FK0032CAAZP HPF2 /dev/sda /dev/sg0
[4:0:0:0] disk HP P2000G3 FC/iSCSI T100 /dev/sdb /dev/sg1
[4:0:1:0] disk HP P2000G3 FC/iSCSI T100 /dev/sdc /dev/sg2
[4:0:2:0] storage HP HSV400 0950 - /dev/sg3
[4:0:2:1] disk HP HSV400 0950 /dev/sdd /dev/sg4
[4:0:3:0] storage HP HSV400 0950 - /dev/sg5
[4:0:3:1] disk HP HSV400 0950 /dev/sde /dev/sg6
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26007:fe756682cc7f
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:31 2012 +0100
xenballoond.init: remove 4 from default runlevel
Remove 4 from default runlevel in xenballoond.init.
Similar to what changeset 24847:0900b1c905f1 does in xencommons, remove
runlevel 4 from the other runlevel scripts. LSB defines runlevel 4 as
reserved for local use, the local sysadmin is responsible for symlink
creation in rc4.d.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26006:8b6870d686d6
user: Olaf Hering <olaf@aepfle.de>
date: Mon Oct 08 12:18:30 2012 +0100
hotplug/Linux: Remove tracing (bash -x) from network-nat script
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26005:cdb48f1742f3
user: Roger Pau Monne <roger.pau@citrix.com>
date: Mon Oct 08 12:18:29 2012 +0100
autoconf: add -Werror to libutil.h header check
libutil.h is only needed on BSDs, but not in Linux. Debian package
libbsd-dev-0.3.0-1 installed a libutil.h overlay that contains a
Perform the libutil.h check with -Werror, so we don't include this
bogus header.
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
changeset: 26004:099589002239
user: Anthony PERARD <anthony.perard@citrix.com>
date: Mon Oct 08 11:45:36 2012 +0100
libxl: Allow migration with qemu-xen.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
(qemu changes not included)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [xen-unstable test] 13934: regressions - FAIL
2012-10-08 19:55 [xen-unstable test] 13934: regressions - FAIL xen.org
@ 2012-10-09 7:50 ` Ian Campbell
2012-10-09 9:26 ` Ian Jackson
0 siblings, 1 reply; 10+ messages in thread
From: Ian Campbell @ 2012-10-09 7:50 UTC (permalink / raw)
To: xen.org; +Cc: xen-devel
On Mon, 2012-10-08 at 20:55 +0100, xen.org wrote:
> flight 13934 xen-unstable real [real]
> http://www.chiark.greenend.org.uk/~xensrcts/logs/13934/
>
> Regressions :-(
>
> Tests which did not succeed and are blocking,
> including tests which could not be run:
> build-i386-oldkern 4 xen-build fail REGR. vs. 13932
> build-i386 4 xen-build fail REGR. vs. 13932
make[2]: Entering directory `/home/osstest/build.13934.build-i386/xen-unstable/docs/figs'
fig2dev -L png network-bridge.fig >network-bridge.png.tmp
/bin/sh: fig2dev: not found
make[2]: *** [network-bridge.png] Error 127
But the of this tool isn't new in this flight.
But wait, this is 13932:
make -C figs
make[2]: Entering directory `/home/osstest/build.13932.build-i386/xen-unstable/docs/figs'
fig2dev -L png network-bridge.fig >network-bridge.png.tmp
/bin/sh: fig2dev: not found
make[2]: *** [network-bridge.png] Error 127
make[2]: Leaving directory `/home/osstest/build.13932.build-i386/xen-unstable/docs/figs'
make[1]: *** [figs] Error 2
make[1]: *** Waiting for unfinished jobs....
But the job seemed to pass! ???
I can't seem to see anything between xxx32 and xxx34 which would have
caused us to stop ignoring this error.
Ian.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [xen-unstable test] 13934: regressions - FAIL
2012-10-09 7:50 ` Ian Campbell
@ 2012-10-09 9:26 ` Ian Jackson
2012-10-09 9:35 ` Ian Jackson
0 siblings, 1 reply; 10+ messages in thread
From: Ian Jackson @ 2012-10-09 9:26 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel
Ian Campbell writes ("Re: [Xen-devel] [xen-unstable test] 13934: regressions - FAIL"):
> But the job seemed to pass! ???
This is indeed quite odd.
The build rune is this:
set -xe
LC_ALL=C; export LC_ALL
PATH=/usr/lib/ccache:$PATH:/usr/lib/git-core
exec </dev/null
cd /home/osstest/build.13932.build-i386
cd xen-unstable
( make -j4
2>&1 && touch ../build-ok-stamp
) |tee ../build-log
test -f ../build-ok-stamp
echo ok.
As you can see the core of that is:
make -j4 2>&1 && touch ../build-ok-stamp
And at the bottom of the transcript we see:
+ touch ../build-ok-stamp
There are no other unrelated occurrences of "build-ok-stamp" in the
log (the other runes have their own stamp files). So either the shell
is buggy or make returned status 0.
This means the bug is in make or in the makefiles. Let me investigate
further...
Ian.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [xen-unstable test] 13934: regressions - FAIL
2012-10-09 9:26 ` Ian Jackson
@ 2012-10-09 9:35 ` Ian Jackson
2012-10-09 9:48 ` Ian Campbell
0 siblings, 1 reply; 10+ messages in thread
From: Ian Jackson @ 2012-10-09 9:35 UTC (permalink / raw)
To: Ian Campbell, xen-devel
Ian Jackson writes ("Re: [Xen-devel] [xen-unstable test] 13934: regressions - FAIL"):
> This means the bug is in make or in the makefiles. Let me investigate
> further...
Subject: [PATCH] build, docs: Do not ignore install-docs errors
In the toplevel Makefile "install-docs" (depended on by "install" and
hence "dist"), but not "build", ignores errors.
This was inherited from before 24563:4271634e4c86, prior to which the
||true seems intended to handle failures of check_pkgs. Nowadays we
handle docs tools individually in the docs makefiles so there is no
need for this ||true here.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff -r 87bf99fad7a9 Makefile
--- a/Makefile Tue Oct 02 12:14:00 2012 +0200
+++ b/Makefile Tue Oct 09 10:29:42 2012 +0100
@@ -103,7 +103,7 @@ tools/firmware/seabios-dir-force-update:
.PHONY: install-docs
install-docs:
- $(MAKE) -C docs install || true
+ $(MAKE) -C docs install
.PHONY: dev-docs
dev-docs:
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [xen-unstable test] 13934: regressions - FAIL
2012-10-09 9:35 ` Ian Jackson
@ 2012-10-09 9:48 ` Ian Campbell
2012-10-09 16:27 ` [PATCH v2 0/3] docs, build: Do not ignore install-docs errors Ian Jackson
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Ian Campbell @ 2012-10-09 9:48 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Tue, 2012-10-09 at 10:35 +0100, Ian Jackson wrote:
> Ian Jackson writes ("Re: [Xen-devel] [xen-unstable test] 13934: regressions - FAIL"):
> > This means the bug is in make or in the makefiles. Let me investigate
> > further...
>
> Subject: [PATCH] build, docs: Do not ignore install-docs errors
>
> In the toplevel Makefile "install-docs" (depended on by "install" and
> hence "dist"), but not "build", ignores errors.
>
> This was inherited from before 24563:4271634e4c86, prior to which the
> ||true seems intended to handle failures of check_pkgs. Nowadays we
> handle docs tools individually in the docs makefiles so there is no
> need for this ||true here.
The docs/fig/Makefile doesn't seem to gracefully handle the absence of
fig2dev, I don't think we want this as an unconditional build dep do we?
It looks like we've inadvertently added an unconditional dependency on
pod2text too.
Ian.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 0/3] docs, build: Do not ignore install-docs errors
2012-10-09 9:48 ` Ian Campbell
@ 2012-10-09 16:27 ` Ian Jackson
2012-10-09 16:43 ` Ian Campbell
2012-10-09 16:27 ` [PATCH 1/3] docs, build: Tolerate missing fig2dev Ian Jackson
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Ian Jackson @ 2012-10-09 16:27 UTC (permalink / raw)
To: xen-devel
Changes in v2: new patches to tolerate missing fig2dev and pod2text,
which is necessary to avoid turning the failure to find fig2dev from
an error ignored in the wrong way into a fatal error. So this is now
a 3-patch series. 3/3 is the unchanged patch from before.
1/3 docs, build: Tolerate missing fig2dev
2/3 docs, build: Tolerate missing pod2text
3/3 docs, build: Do not ignore install-docs errors
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] docs, build: Tolerate missing fig2dev
2012-10-09 9:48 ` Ian Campbell
2012-10-09 16:27 ` [PATCH v2 0/3] docs, build: Do not ignore install-docs errors Ian Jackson
@ 2012-10-09 16:27 ` Ian Jackson
2012-10-09 16:27 ` [PATCH 2/3] docs, build: Tolerate missing pod2text Ian Jackson
2012-10-09 16:27 ` [PATCH 3/3] docs, build: Do not ignore install-docs errors Ian Jackson
3 siblings, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2012-10-09 16:27 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/Makefile | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/docs/Makefile b/docs/Makefile
index 8806990..e9f6c20 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -42,7 +42,9 @@ txt: $(DOC_TXT)
.PHONY: figs
figs:
- $(MAKE) -C figs
+ @set -e ; if which $(FIG2DEV) 1>/dev/null 2>/dev/null; then \
+ set -x; $(MAKE) -C figs ; else \
+ echo "fig2dev (transfig) not installed; skipping figs."; fi
.PHONY: python-dev-docs
python-dev-docs:
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] docs, build: Tolerate missing pod2text
2012-10-09 9:48 ` Ian Campbell
2012-10-09 16:27 ` [PATCH v2 0/3] docs, build: Do not ignore install-docs errors Ian Jackson
2012-10-09 16:27 ` [PATCH 1/3] docs, build: Tolerate missing fig2dev Ian Jackson
@ 2012-10-09 16:27 ` Ian Jackson
2012-10-09 16:27 ` [PATCH 3/3] docs, build: Do not ignore install-docs errors Ian Jackson
3 siblings, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2012-10-09 16:27 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
We gate the whole of the "txt" target on pod2text. I think this is
better than gating only the pod-generated outputs; it avoids a partial
output tree.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
docs/Makefile | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/docs/Makefile b/docs/Makefile
index e9f6c20..03f141a 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -38,7 +38,10 @@ dev-docs: python-dev-docs
html: $(DOC_HTML) html/index.html
.PHONY: txt
-txt: $(DOC_TXT)
+txt:
+ @if which $(POD2TEXT) 1>/dev/null 2>/dev/null; then \
+ $(MAKE) $(DOC_TXT); else \
+ echo "pod2text not installed; skipping text outputs."; fi
.PHONY: figs
figs:
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] docs, build: Do not ignore install-docs errors
2012-10-09 9:48 ` Ian Campbell
` (2 preceding siblings ...)
2012-10-09 16:27 ` [PATCH 2/3] docs, build: Tolerate missing pod2text Ian Jackson
@ 2012-10-09 16:27 ` Ian Jackson
3 siblings, 0 replies; 10+ messages in thread
From: Ian Jackson @ 2012-10-09 16:27 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson
In the toplevel Makefile "install-docs" (depended on by "install" and
hence "dist"), but not "build", ignores errors.
This was inherited from before 24563:4271634e4c86, prior to which the
||true seems intended to handle failures of check_pkgs. Nowadays we
handle docs tools individually in the docs makefiles so there is no
need for this ||true here.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 373ca19..b54cfbf 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ tools/firmware/seabios-dir-force-update:
.PHONY: install-docs
install-docs:
- $(MAKE) -C docs install || true
+ $(MAKE) -C docs install
.PHONY: dev-docs
dev-docs:
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/3] docs, build: Do not ignore install-docs errors
2012-10-09 16:27 ` [PATCH v2 0/3] docs, build: Do not ignore install-docs errors Ian Jackson
@ 2012-10-09 16:43 ` Ian Campbell
0 siblings, 0 replies; 10+ messages in thread
From: Ian Campbell @ 2012-10-09 16:43 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel
On Tue, 2012-10-09 at 17:27 +0100, Ian Jackson wrote:
> Changes in v2: new patches to tolerate missing fig2dev and pod2text,
> which is necessary to avoid turning the failure to find fig2dev from
> an error ignored in the wrong way into a fatal error. So this is now
> a 3-patch series. 3/3 is the unchanged patch from before.
All three:
Acked-by: Ian Campbell <ian.campbell@citrix.com>
I am running them all through my usual pre-commit tests then I'll push,
hopefully we should then get staging push overnight.
Ian.
>
> 1/3 docs, build: Tolerate missing fig2dev
> 2/3 docs, build: Tolerate missing pod2text
> 3/3 docs, build: Do not ignore install-docs errors
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-10-09 16:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-08 19:55 [xen-unstable test] 13934: regressions - FAIL xen.org
2012-10-09 7:50 ` Ian Campbell
2012-10-09 9:26 ` Ian Jackson
2012-10-09 9:35 ` Ian Jackson
2012-10-09 9:48 ` Ian Campbell
2012-10-09 16:27 ` [PATCH v2 0/3] docs, build: Do not ignore install-docs errors Ian Jackson
2012-10-09 16:43 ` Ian Campbell
2012-10-09 16:27 ` [PATCH 1/3] docs, build: Tolerate missing fig2dev Ian Jackson
2012-10-09 16:27 ` [PATCH 2/3] docs, build: Tolerate missing pod2text Ian Jackson
2012-10-09 16:27 ` [PATCH 3/3] docs, build: Do not ignore install-docs errors Ian Jackson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.