But make check fails still though, I'm now seeing an error
>> when it gathers the topology:
>>
>> Saving current system topology to a tarball...
>> /tmp/hwloc/hwloc-1.1rc2/tests/linux/hwloc-gather-topology.sh: line 54:
>> /tmp/tmp.WPnBao1790/save//proc/cpuinfo: No such file or directory
>> /tmp/hwloc/hwloc-1.1rc2/tests/linux/hwloc-gather-topology.sh: line 54:
>> /tmp/tmp.WPnBao1790/save//proc/meminfo: No such file or directory
>> /tmp/hwloc/hwloc-1.1rc2/tests/linux/hwloc-gather-topology.sh: line 54:
>> /tmp/tmp.WPnBao1790/save//proc/stat: No such file or directory
>>     
> Ok, I'll fix those.
>   

This patch (on top of the previous patch) should make
hwloc-gather-topology.sh work again (and make check too, hopefully).

Brice

commit e0826ecff1484574bde89ad6695d0f7b5a62f6a2
Author: Brice Goglin <bgog...@inria.fr>
List-Post: hwloc-devel@lists.open-mpi.org
Date:   Sun Nov 21 19:53:21 2010 +0100

    Gather empty directories in linux test tarballs

    Otherwise the behavior between actual machine and topology tarballs
    may differ a bit. This will help debugging some problems remotely.

diff --git a/tests/linux/hwloc-gather-topology.sh.in b/tests/linux/hwloc-gather-topology.sh.in
index 022b30e..536c0fc 100755
--- a/tests/linux/hwloc-gather-topology.sh.in
+++ b/tests/linux/hwloc-gather-topology.sh.in
@@ -45,8 +45,12 @@ destdir=`mktemp -d`
 savepath() {
   local dest="$1"
   local path="$2"
+  # gather all directories, including empty ones
+  find "$path" -type d 2>/dev/null | while read dir ; do	\
+    mkdir -p "$dest/$dir" 2>/dev/null ;		\
+  done
+  # gather all files now
   find "$path" -type f 2>/dev/null | while read file ; do	\
-    mkdir -p "$dest/"`dirname $file` ;		\
     cat "$file" > "$dest/$file" 2>/dev/null ;	\
   done
 }

Reply via email to