lvm2-commits February 2015

lvm2-commits@lists.fedorahosted.org

8 participants
239 discussions

master - NIX: Adjust install_rpms (kernel rpm is now required).
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b9a017d94cb5ad43… Commit: b9a017d94cb5ad432c51df861242f42cc4f01ba3 Parent: 81b34dce6173cb8599aebb5e052d8df573d3aecb Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Thu Feb 5 13:30:18 2015 +0100 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:39 2015 +0100 NIX: Adjust install_rpms (kernel rpm is now required). --- nix/default.nix | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 6bb94db..f9f025f 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -302,6 +302,7 @@ let "redhat-rpm-config" # needed for rpmbuild of lvm "which" "e2fsprogs" # needed for fsadm "perl-GD" # for lcov + "kernel" ]; centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "valgrind-devel" ]; centos64 = centos63; @@ -314,7 +315,8 @@ let "dlm" "systemd-devel" "perl-Digest-MD5" ]; fedora18u = fedora18; - fedora19 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" "procps-ng" "valgrind-devel" ]; + fedora19 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" "procps-ng" + "valgrind-devel" ]; fedora19u = fedora19; fedora20 = fedora19;

1 0

master - NIX: We need to install lcov for ./configure now as well.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=81b34dce6173cb85… Commit: 81b34dce6173cb8599aebb5e052d8df573d3aecb Parent: 5cd6cce5a41cd5583470c45bad2dad4b08f04ad2 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Thu Feb 5 13:30:02 2015 +0100 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:38 2015 +0100 NIX: We need to install lcov for ./configure now as well. --- nix/default.nix | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index b72379e..6bb94db 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -11,6 +11,11 @@ let pkgs = import nixpkgs {}; lib = pkgs.lib; over = overrides { inherit pkgs; }; + install_lcov = '' + rpm -Uv ${pkgs.fetchurl { + url = "http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/16/i386/…"; + sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }} + ''; mkTest = args: pkgs.stdenv.mkDerivation rec { name = "lvm2-test-${(args.diskFun {}).name}"; @@ -42,9 +47,7 @@ let # we always run in a fresh image, so need to install everything again ls ${build}/rpms/*/*.rpm | grep -v sysvinit | xargs rpm -Uv --oldpackage # */ - rpm -Uv ${pkgs.fetchurl { - url = "http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/16/i386/…"; - sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }} + ${install_lcov} mkdir -p /xchg/results touch /xchg/booted @@ -168,6 +171,8 @@ let memSize = 512; checkPhase = ":"; + preConfigure = install_lcov; + postInstall = '' mkdir -p $out/nix-support for i in $out/rpms/*/*.rpm; do # */

1 0

master - NIX: Move corosynclib-devel & valgrind-devel out of common.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5cd6cce5a41cd558… Commit: 5cd6cce5a41cd5583470c45bad2dad4b08f04ad2 Parent: 57c39ecbcd6b97643f99427dfe426cc20c1acd66 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Jan 14 17:29:13 2015 +0100 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:37 2015 +0100 NIX: Move corosynclib-devel & valgrind-devel out of common. --- nix/default.nix | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index cd92b91..b72379e 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -293,13 +293,12 @@ let install_rpms = rec { common = [ "libselinux-devel" "libsepol-devel" "ncurses-devel" "readline-devel" - "corosynclib-devel" - "valgrind" "valgrind-devel" "gdb" "strace" + "valgrind" "gdb" "strace" "redhat-rpm-config" # needed for rpmbuild of lvm "which" "e2fsprogs" # needed for fsadm "perl-GD" # for lcov ]; - centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" ]; + centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" "valgrind-devel" ]; centos64 = centos63; centos65 = centos64; fedora16 = [ "clusterlib-devel" "openaislib-devel" "cman" "systemd-devel" "libudev-devel" ]; @@ -310,7 +309,7 @@ let "dlm" "systemd-devel" "perl-Digest-MD5" ]; fedora18u = fedora18; - fedora19 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" "procps-ng" ]; + fedora19 = [ "dlm-devel" "dlm" "corosynclib-devel" "perl-Digest-MD5" "systemd-devel" "procps-ng" "valgrind-devel" ]; fedora19u = fedora19; fedora20 = fedora19;

1 0

master - NIX: Allow adding/overriding test configurations.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=57c39ecbcd6b9764… Commit: 57c39ecbcd6b97643f99427dfe426cc20c1acd66 Parent: 7c9d690f9e5a5490d7288441a813180eff2e20a2 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Jan 14 17:28:44 2015 +0100 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:07 2015 +0100 NIX: Allow adding/overriding test configurations. --- nix/default.nix | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 4193354..cd92b91 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -4,11 +4,13 @@ fc20_32_updates ? "", fc20_64_updates ? "", fc19_32_updates ? "", fc19_64_updates ? "", fc18_32_updates ? "", fc18_64_updates ? "", - T ? "", ENV ? "", timeout ? 60 }: + T ? "", ENV ? "", timeout ? 60, + overrides ? { pkgs }: { install_rpms = {}; distros = {}; configs = {}; } }: let pkgs = import nixpkgs {}; lib = pkgs.lib; + over = overrides { inherit pkgs; }; mkTest = args: pkgs.stdenv.mkDerivation rec { name = "lvm2-test-${(args.diskFun {}).name}"; @@ -189,7 +191,8 @@ let then "ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/development/${ver}/${arch}/os/" else "mirror://fedora/linux/releases/${ver}/Everything/${arch}/os/"; fedora_update_url = ver: arch: "mirror://fedora/linux/updates/${ver}/${arch}"; - extra_distros = with lib; let + + distros = with lib; let centos = { version, sha, arch }: { name = "centos-${version}-${arch}"; fullName = "CentOS ${version} (${arch})"; @@ -273,7 +276,7 @@ let version="7"; arch="x86_64"; sha="1a7dd0d315b39ad504f54ea88676ab502a48064cb2d875ae3ae29431e175861c"; }; - }; + } // over.distros; vm = { pkgs, xmods, dmmods ? false }: with lib; rec { tools = import "${nixpkgs}/pkgs/build-support/vm/default.nix" { @@ -283,12 +286,12 @@ let release = import "${nixpkgs}/pkgs/build-support/release/default.nix" { pkgs = pkgs // { vmTools = tools; }; }; imgs = tools.diskImageFuns // - mapAttrs (n: a: b: pkgs.vmTools.makeImageFromRPMDist (a // b)) extra_distros; - rpmdistros = tools.rpmDistros // extra_distros; + mapAttrs (n: a: b: pkgs.vmTools.makeImageFromRPMDist (a // b)) distros; + rpmdistros = tools.rpmDistros // distros; rpmbuild = tools.buildRPM; }; - extra_rpms = rec { + install_rpms = rec { common = [ "libselinux-devel" "libsepol-devel" "ncurses-devel" "readline-devel" "corosynclib-devel" "valgrind" "valgrind-devel" "gdb" "strace" @@ -316,7 +319,7 @@ let centos70 = fedora20; rawhide = fedora20; - }; + } // over.install_rpms; wrapper = fun: { arch, image, build ? {}, istest ? false }: with lib; let use = vm { pkgs = if eqStrings arch "i386" then pkgs.pkgsi686Linux else pkgs; @@ -327,7 +330,7 @@ let inherit build istest; VM = use.rpmbuild; diskFun = builtins.getAttr "${image}${arch}" use.imgs; - extras = extra_rpms.common ++ builtins.getAttr image extra_rpms; + extras = install_rpms.common ++ builtins.getAttr image install_rpms; vmtools = use.tools; kernel = use.tools.makeKernelFromRPMDist (builtins.getAttr "${image}${arch}" use.rpmdistros); }; @@ -360,7 +363,7 @@ let rawhide_i386 = { arch = "i386" ; image = "rawhide"; }; rawhide_x86_64 = { arch = "x86_64" ; image = "rawhide"; }; - }; + } // over.configs; rpms = lib.mapAttrs (n: v: wrapper mkBuild v) configs; tests = let make = n: v: wrapper mkTest (v // { build = builtins.getAttr n rpms; istest = true; });

1 0

master - NIX: Set ulimit -c to unlimited, to get backtraces in logs.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7c9d690f9e5a5490… Commit: 7c9d690f9e5a5490d7288441a813180eff2e20a2 Parent: 6ba05212f75b2e519c10b5758f3526cb8ca8f947 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Nov 19 11:32:23 2014 +0100 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:07 2015 +0100 NIX: Set ulimit -c to unlimited, to get backtraces in logs. --- nix/default.nix | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 4d7c38a..4193354 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -50,6 +50,7 @@ let dmsetup targets export LVM_TEST_BACKING_DEVICE=/dev/sdb + ulimit -c unlimited watch= if echo ${flavour} | grep -q udev; then

1 0

master - NIX: Add a CentOS 7.0 64b build.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6ba05212f75b2e51… Commit: 6ba05212f75b2e519c10b5758f3526cb8ca8f947 Parent: 4686b8cea57d0c36759b73a5448e6c0f99405132 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Mon Oct 13 09:18:23 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:06 2015 +0100 NIX: Add a CentOS 7.0 64b build. --- nix/default.nix | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 603b3dc..4d7c38a 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -39,7 +39,7 @@ let export PATH=/usr/bin:/bin:/usr/sbin:/sbin # we always run in a fresh image, so need to install everything again - ls ${build}/rpms/*/*.rpm | grep -v sysvinit | xargs rpm -Uv # */ + ls ${build}/rpms/*/*.rpm | grep -v sysvinit | xargs rpm -Uv --oldpackage # */ rpm -Uv ${pkgs.fetchurl { url = "http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/16/i386/…"; sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }} @@ -181,7 +181,7 @@ let "cifs" "virtio_net" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" "ata_piix" "sd_mod" ]; - centos_url = ver: arch: if ver == "6.5" + centos_url = ver: arch: if ver == "6.5" || ver == "7" then "http://ftp.fi.muni.cz/pub/linux/centos/${ver}/os/${arch}/" else "http://vault.centos.org/${ver}/os/${arch}/"; fedora_url = ver: arch: if lib.eqStrings ver "rawhide" || lib.eqStrings ver "19" @@ -267,6 +267,11 @@ let version="6.5"; arch="x86_64"; sha="3353e378f5cb4bb6c3b3dd2ca266c6d68a1e29c36cf99f76aea3d8e158626024"; }; + + centos70x86_64 = centos { + version="7"; arch="x86_64"; + sha="1a7dd0d315b39ad504f54ea88676ab502a48064cb2d875ae3ae29431e175861c"; + }; }; vm = { pkgs, xmods, dmmods ? false }: with lib; rec { @@ -307,6 +312,8 @@ let fedora20 = fedora19; fedora20u = fedora20; + centos70 = fedora20; + rawhide = fedora20; }; @@ -348,6 +355,8 @@ let centos65_i386 = { arch = "i386" ; image = "centos65"; }; centos65_x86_64 = { arch = "x86_64" ; image = "centos65"; }; + centos70_x86_64 = { arch = "x86_64" ; image = "centos70"; }; + rawhide_i386 = { arch = "i386" ; image = "rawhide"; }; rawhide_x86_64 = { arch = "x86_64" ; image = "rawhide"; }; };

1 0

master - test: Fix a segfault in the test runner.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4686b8cea57d0c36… Commit: 4686b8cea57d0c36759b73a5448e6c0f99405132 Parent: 45e2aee8f9173cc2858da93a4bb9bc289a36bf9d Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Oct 1 16:04:21 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:06 2015 +0100 test: Fix a segfault in the test runner. --- test/lib/brick-shelltest.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/lib/brick-shelltest.h b/test/lib/brick-shelltest.h index 7a2b8f0..99e6639 100644 --- a/test/lib/brick-shelltest.h +++ b/test/lib/brick-shelltest.h @@ -600,11 +600,11 @@ struct IO : Sink { Observer &observer() { return *_observer; } IO() { - sinks.push_back( _observer = new Observer ); + clear(); } /* a stealing copy constructor */ - IO( const IO &io ) : sinks( io.sinks ), sources( io.sources ) + IO( const IO &io ) : sinks( io.sinks ), sources( io.sources ), _observer( io._observer ) { io.sinks.clear(); io.sources.clear(); @@ -619,6 +619,7 @@ struct IO : Sink { for ( Sinks::iterator i = sinks.begin(); i != sinks.end(); ++i ) delete *i; sinks.clear(); + sinks.push_back( _observer = new Observer ); } ~IO() { close(); clear(); }

1 0

master - test: It is not an error for a test daemon to exit before teardown.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=45e2aee8f9173cc2… Commit: 45e2aee8f9173cc2858da93a4bb9bc289a36bf9d Parent: 78ba413ed148f34a36e2e041947e66a681255d0d Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Oct 1 11:53:24 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:06 2015 +0100 test: It is not an error for a test daemon to exit before teardown. --- test/lib/aux.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 3ef2da0..9241fba 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -214,7 +214,7 @@ kill_sleep_kill_() { slow=$2 if test -s $pidfile ; then pid=$(< $pidfile) - kill -TERM $pid + kill -TERM $pid || return 0 if test $slow -eq 0 ; then sleep .1 ; else sleep 1 ; fi kill -KILL $pid 2>/dev/null || true wait=0

1 0

master - test: Remove spurious set -x in lvm-wrapper.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=78ba413ed148f34a… Commit: 78ba413ed148f34a36e2e041947e66a681255d0d Parent: d8983d4bd4c76381c8bd9149c942b83cd8d013b4 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Oct 1 11:50:31 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:06 2015 +0100 test: Remove spurious set -x in lvm-wrapper. --- test/lib/lvm-wrapper.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/test/lib/lvm-wrapper.sh b/test/lib/lvm-wrapper.sh index 496facc..8bc96a2 100644 --- a/test/lib/lvm-wrapper.sh +++ b/test/lib/lvm-wrapper.sh @@ -31,8 +31,6 @@ if test -n "$LVM_STRACE"; then RUN_DBG="strace $LVM_STRACE -o strace.log" fi -set -x - case "$CMD" in lvs|pvs|vgs|vgck|vgscan) test ${LVM_DEBUG_LEVEL:-0} -lt 2 && RUN_DBG= ;;

1 0

master - test: Properly detect warnings from testcases.
by Petr Rockai 05 Feb '15

05 Feb '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d8983d4bd4c76381… Commit: d8983d4bd4c76381c8bd9149c942b83cd8d013b4 Parent: c96e42006d3bbbcc21cf952c96bf1fc7b15f1bd0 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Wed Oct 1 11:28:15 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Thu Feb 5 13:51:06 2015 +0100 test: Properly detect warnings from testcases. --- test/lib/brick-shelltest.h | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/test/lib/brick-shelltest.h b/test/lib/brick-shelltest.h index 71194cf..7a2b8f0 100644 --- a/test/lib/brick-shelltest.h +++ b/test/lib/brick-shelltest.h @@ -543,8 +543,22 @@ struct KMsg : Source { }; struct Observer : Sink { - Observer() {} - void push( std::string ) {} + TimedBuffer stream; + + bool warnings; + Observer() : warnings( false ) {} + + void push( std::string s ) { + stream.push( s ); + } + + void sync( bool force ) { + while ( !stream.empty( force ) ) { + TimedBuffer::Line line = stream.shift( force ); + if ( line.second.find( "TEST WARNING" ) != std::string::npos ) + warnings = true; + } + } }; struct IO : Sink { @@ -850,6 +864,9 @@ struct TestCase { else r = Journal::FAILED; + if ( r == Journal::PASSED && io.observer().warnings ) + r = Journal::WARNED; + io.close(); if ( iobuf && ( r == Journal::FAILED || r == Journal::TIMEOUT ) )

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits February 2015