24 files changed, 12 insertions, 12 deletions
diff --git a/testsuite/iostat b/testsuite/normal/iostat
index f1ac28c..f1ac28c 100644
--- a/testsuite/iostat
+++ b/testsuite/normal/iostat
diff --git a/testsuite/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index c82e97f..c82e97f 100644
--- a/testsuite/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
diff --git a/testsuite/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index a4733e0..a4733e0 100644
--- a/testsuite/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
diff --git a/testsuite/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index 48a15e6..48a15e6 100644
--- a/testsuite/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
diff --git a/testsuite/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 010c3c7..010c3c7 100644
--- a/testsuite/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
diff --git a/testsuite/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index da0329c..da0329c 100644
--- a/testsuite/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
diff --git a/testsuite/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 5c8aade..5c8aade 100644
--- a/testsuite/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
diff --git a/testsuite/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index 7d9c106..7d9c106 100644
--- a/testsuite/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
diff --git a/testsuite/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 3e6d860..3e6d860 100644
--- a/testsuite/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
diff --git a/testsuite/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index f952965..f952965 100644
--- a/testsuite/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
diff --git a/testsuite/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 1fffc1b..1fffc1b 100644
--- a/testsuite/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
diff --git a/testsuite/vmstat b/testsuite/normal/vmstat
index 17e5aca..17e5aca 100644
--- a/testsuite/vmstat
+++ b/testsuite/normal/vmstat
diff --git a/testsuite/run-test-uml.sh b/testsuite/run-test-uml.sh
index 70fd352..49a1c37 100755
--- a/testsuite/run-test-uml.sh
+++ b/testsuite/run-test-uml.sh
@@ -8,7 +8,7 @@ pbuilder-user-mode-linux test --configfile non-existing-configfile
 
 if [ -x "${PBUILDER_UML}" ]; then
     for distribution in sid sarge; do
-	pbuilder-user-mode-linux create --mirror  http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --uml-image $(pwd)/testimage --logfile pbuilder-user-mode-linux-create-${distribution}.log
+	pbuilder-user-mode-linux create --mirror  http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --uml-image $(pwd)/testimage --logfile uml/pbuilder-user-mode-linux-create-${distribution}.log
 
 	for PKG in dsh; do 
 	    ( 
@@ -16,17 +16,17 @@ if [ -x "${PBUILDER_UML}" ]; then
 		cd testbuild
 		apt-get source -d ${PKG}
 	    )
-	    pbuilder-user-mode-linux build --uml-image $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile pbuilder-user-mode-linux-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc
+	    pbuilder-user-mode-linux build --uml-image $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile uml/pbuilder-user-mode-linux-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc
 	    (
 		mkdir testbuild2
 		cd testbuild2
 		apt-get source ${PKG}
 		cd ${PKG}-*
-		pdebuild-user-mode-linux --logfile ../../pdebuild-user-mode-linux-normal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
-		pdebuild-user-mode-linux --use-pdebuild-internal --logfile ../../pdebuild-user-mode-linux-internal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
+		pdebuild-user-mode-linux --logfile ../../uml/pdebuild-user-mode-linux-normal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
+		pdebuild-user-mode-linux --use-pdebuild-internal --logfile ../../uml/pdebuild-user-mode-linux-internal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
 	    )
 	done
-	pbuilder-user-mode-linux execute --uml-image $(pwd)/testimage --logfile pbuilder-user-mode-linux-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3
+	pbuilder-user-mode-linux execute --uml-image $(pwd)/testimage --logfile uml/pbuilder-user-mode-linux-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3
 	rm -rf testbuild testbuild2 testimage
     done
 fi
diff --git a/testsuite/run-test.sh b/testsuite/run-test.sh
index 6941236..0cfc99b 100755
--- a/testsuite/run-test.sh
+++ b/testsuite/run-test.sh
@@ -4,14 +4,14 @@
 
 PBUILDER=/usr/sbin/pbuilder
 
-vmstat -n 1 > vmstat &
+vmstat -n 1 > normal/vmstat &
 VMSTATPID=$!
-LC_ALL=C iostat -dxt hda 1 > iostat & 
+LC_ALL=C iostat -dxt hda 1 > normal/iostat & 
 IOSTATPID=$!
 
 if [ -x "${PBUILDER}" ]; then
     for distribution in sid sarge; do
-	sudo ${PBUILDER} create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --basetgz $(pwd)/testimage --logfile pbuilder-create-${distribution}.log 
+	sudo ${PBUILDER} create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --basetgz $(pwd)/testimage --logfile normal/pbuilder-create-${distribution}.log 
 
 	for PKG in dsh; do 
 	    ( 
@@ -19,17 +19,17 @@ if [ -x "${PBUILDER}" ]; then
 		cd testbuild
 		apt-get source -d ${PKG}
 	    )
-	    sudo ${PBUILDER} build --basetgz $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile pbuilder-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc
+	    sudo ${PBUILDER} build --basetgz $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile normal/pbuilder-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc
 	    (
 		mkdir testbuild2
 		cd testbuild2
 		apt-get source ${PKG}
 		cd ${PKG}-*
-		pdebuild --logfile ../../pdebuild-normal-${distribution}.log -- --basetgz $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
-		pdebuild --use-pdebuild-internal --logfile ../../pdebuild-internal-${distribution}.log -- --basetgz $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
+		pdebuild --logfile ../../normal/pdebuild-normal-${distribution}.log -- --basetgz $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
+		pdebuild --use-pdebuild-internal --logfile ../../normal/pdebuild-internal-${distribution}.log -- --basetgz $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/
 	    )
 	done
-	sudo ${PBUILDER} execute --basetgz $(pwd)/testimage --logfile pbuilder-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3
+	sudo ${PBUILDER} execute --basetgz $(pwd)/testimage --logfile normal/pbuilder-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3
 	sudo rm -rf testbuild testbuild2 testimage
     done
 fi
diff --git a/testsuite/pbuilder-user-mode-linux-build-dsh-sarge.log b/testsuite/uml/pbuilder-user-mode-linux-build-dsh-sarge.log
index 0e5f591..0e5f591 100644
--- a/testsuite/pbuilder-user-mode-linux-build-dsh-sarge.log
+++ b/testsuite/uml/pbuilder-user-mode-linux-build-dsh-sarge.log
diff --git a/testsuite/pbuilder-user-mode-linux-build-dsh-sid.log b/testsuite/uml/pbuilder-user-mode-linux-build-dsh-sid.log
index b8d2489..b8d2489 100644
--- a/testsuite/pbuilder-user-mode-linux-build-dsh-sid.log
+++ b/testsuite/uml/pbuilder-user-mode-linux-build-dsh-sid.log
diff --git a/testsuite/pbuilder-user-mode-linux-create-sarge.log b/testsuite/uml/pbuilder-user-mode-linux-create-sarge.log
index ba729b6..ba729b6 100644
--- a/testsuite/pbuilder-user-mode-linux-create-sarge.log
+++ b/testsuite/uml/pbuilder-user-mode-linux-create-sarge.log
diff --git a/testsuite/pbuilder-user-mode-linux-create-sid.log b/testsuite/uml/pbuilder-user-mode-linux-create-sid.log
index 7d03e02..7d03e02 100644
--- a/testsuite/pbuilder-user-mode-linux-create-sid.log
+++ b/testsuite/uml/pbuilder-user-mode-linux-create-sid.log
diff --git a/testsuite/pbuilder-user-mode-linux-execute-sarge.log b/testsuite/uml/pbuilder-user-mode-linux-execute-sarge.log
index 4beae4c..4beae4c 100644
--- a/testsuite/pbuilder-user-mode-linux-execute-sarge.log
+++ b/testsuite/uml/pbuilder-user-mode-linux-execute-sarge.log
diff --git a/testsuite/pbuilder-user-mode-linux-execute-sid.log b/testsuite/uml/pbuilder-user-mode-linux-execute-sid.log
index 85351dc..85351dc 100644
--- a/testsuite/pbuilder-user-mode-linux-execute-sid.log
+++ b/testsuite/uml/pbuilder-user-mode-linux-execute-sid.log
diff --git a/testsuite/pdebuild-user-mode-linux-internal-sarge.log b/testsuite/uml/pdebuild-user-mode-linux-internal-sarge.log
index 8024902..8024902 100644
--- a/testsuite/pdebuild-user-mode-linux-internal-sarge.log
+++ b/testsuite/uml/pdebuild-user-mode-linux-internal-sarge.log
diff --git a/testsuite/pdebuild-user-mode-linux-internal-sid.log b/testsuite/uml/pdebuild-user-mode-linux-internal-sid.log
index 2a9bcb5..2a9bcb5 100644
--- a/testsuite/pdebuild-user-mode-linux-internal-sid.log
+++ b/testsuite/uml/pdebuild-user-mode-linux-internal-sid.log
diff --git a/testsuite/pdebuild-user-mode-linux-normal-sarge.log b/testsuite/uml/pdebuild-user-mode-linux-normal-sarge.log
index cd23a69..cd23a69 100644
--- a/testsuite/pdebuild-user-mode-linux-normal-sarge.log
+++ b/testsuite/uml/pdebuild-user-mode-linux-normal-sarge.log
diff --git a/testsuite/pdebuild-user-mode-linux-normal-sid.log b/testsuite/uml/pdebuild-user-mode-linux-normal-sid.log
index 9b8e329..9b8e329 100644
--- a/testsuite/pdebuild-user-mode-linux-normal-sid.log
+++ b/testsuite/uml/pdebuild-user-mode-linux-normal-sid.log