[prev in list] [next in list] [prev in thread] [next in thread] 

List:       netcf-devel
Subject:    [netcf-devel] [PATCH 04/11] Move initscripts test data into single location
From:       laine () laine ! org (Laine Stump)
Date:       2011-09-22 17:47:06
Message-ID: 4E7B749A.7090102 () laine ! org
[Download RAW message or body]

On 09/21/2011 12:50 PM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange"<berrange at redhat.com>
>
> The test-redhat.c test program uses data files in tests/root
> and tests/redhat. The tests/root directory will soon need to
> have different content for Debian, Suse, etc. So move that
> to tests/redhat/fsroot, and move the existing content of
> tests/redhat to tests/redhat/schema
> ---
>   tests/Makefile.am                                  |    2 +-
>   tests/redhat/bond-arp.xml                          |   24 -------------
>   tests/redhat/bond-defaults.xml                     |   28 ---------------
>   tests/redhat/bond.xml                              |   28 ---------------
>   tests/redhat/bridge-bond.xml                       |   37 --------------------
>   tests/redhat/bridge-empty.xml                      |   10 -----
>   tests/redhat/bridge-no-address.xml                 |   26 --------------
>   tests/redhat/bridge-vlan.xml                       |   16 --------
>   tests/redhat/bridge.xml                            |   28 ---------------
>   tests/redhat/ethernet-dhcp.xml                     |   14 -------
>   tests/redhat/ethernet-static-no-prefix.xml         |   14 -------
>   tests/redhat/ethernet-static.xml                   |   15 --------
>   tests/redhat/fsroot/etc/sysconfig/iptables         |   12 ++++++

This points out that I forgot to remove these three files when I ripped 
out the iptables manipulation:

  tests/root/etc/sysconfig/iptables                  |   12 ------
  tests/root/etc/sysconfig/system-config-firewall    |    5 ---
  .../proc/sys/net/bridge/bridge-nf-call-iptables


I also notice these files made the move over to the Suse test directory. 
If you want to just remove these rather than moving them, I'd be fine 
with that (otherwise I'll go in after the fact and remove them).

I went through my normal build process for Fedora, and didn't encounter 
any errors, so this hasn't broken anything.

ACK.


[prev in list] [next in list] [prev in thread] [next in thread]