From ae1fed5ff28f33012e56273bfddd4a4d50fcf62b Mon Sep 17 00:00:00 2001
From: Eleanor Saitta <ella@dymaxion.org>
Date: Tue, 29 Sep 2015 11:29:12 -0400
Subject: [PATCH] Fixing doc issues

This set of directions should actually be complete now.
---
 README_initial_setup.md | 26 +++++++++++++++++++++++---
 tests/run.sh            |  2 +-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/README_initial_setup.md b/README_initial_setup.md
index ee24868..bff0404 100644
--- a/README_initial_setup.md
+++ b/README_initial_setup.md
@@ -1,10 +1,10 @@
-Install Qemu
+Install Qemu and Expect
 ============
 
 Install the necessary packages:
 
 ```
-    sudo apt-get qemu qemu-user-static
+    sudo apt-get install qemu qemu-user-static expect
 ```
 
 Create a new image from scratch
@@ -196,6 +196,12 @@ Final image specifics
     sudo ./copy_to_final.sh
 ```
 
+* Get the PyCIRCLean modules
+```
+    pip install git+https://github.com/CIRCL/PyCIRCLean
+```
+
+
 * Exit the chroot
 
 Write the image on a SD card
@@ -210,9 +216,23 @@ Write the image on a SD card
 Run the tests
 =============
 
-Make sure to set the filename of the image in `tests/run.sh`
+* Get the qemu kernel:
+```
+   pushd tests; wget https://github.com/dhruvvyas90/qemu-rpi-kernel/raw/master/kernel-qemu; popd
+```
 
+* Put some test data from tests/testFiles into tests/content_img_vfat_norm
+
+* Comment out the other tests in tests/run.sh or populate those directories as
+  well
+
+* Make sure to set the filename of the image and the kernel in `tests/run.sh`
+
+* Run the tests:
 ```
     sudo ./run_tests.sh
 ```
 
+* If the image run processed images correctly but doesn't exit and unmount the
+  images cleanly, look at tests/run.exp and make sure it's waiting for the
+  string your qemu and kernel actually produce.
diff --git a/tests/run.sh b/tests/run.sh
index a20e033..5af9967 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# http://xecdesign.com/qemu-emulating-raspberry-pi-the-easy-way/
+# http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/
 
 IMAGE='../2015-02-16-raspbian-wheezy.img'
 OFFSET_ROOTFS=$((122880 * 512))