From a13e0f84316279055d507a9ef81de51390ff55e7 Mon Sep 17 00:00:00 2001
From: Ben Niemann <pink@odahoda.de>
Date: Sat, 20 Jul 2019 07:45:18 +0200
Subject: [PATCH] Some more doc updates.

Failed to run vmtests - those seem to be broken more fundamentally...
---
 README.md                  |  2 +-
 docs/dev/vmtests.md        | 10 ++++------
 noisidev/vmtests/ubuntu.py | 13 ++++---------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 9fe4e3ab..a94f6c5e 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,6 @@ You can either run it from the build directory:
 
     bin/noisicaä
 
-Or install it to `/usr/local`.
+Or install it to `/usr/local`:
 
     sudo ./waf install
diff --git a/docs/dev/vmtests.md b/docs/dev/vmtests.md
index adb41553..4aa52e2b 100644
--- a/docs/dev/vmtests.md
+++ b/docs/dev/vmtests.md
@@ -17,8 +17,7 @@ distribution, build noisicaä from source and then run the test suite.
 Before you can run test vmtests, you might have to install some additional packages:
 
 ```bash
-pip install $(./listdeps --pip --vmtests)
-sudo apt install $(./listdeps --system --vmtests)
+./waf configure --enable-vmtests --download --install-system-packages
 ```
 
 The VMs are stored in a `vmtests` directory. That directory will contain some large files, so if you
@@ -34,7 +33,7 @@ ln -s /path/to/vmtests vmtests
 ## Running the tests
 
 ```bash
-python -m noisidev.runvmtests
+venv/bin/python -m noisidev.runvmtests
 ```
 
 * Each distribution runs in a separate VM.
@@ -44,7 +43,7 @@ python -m noisidev.runvmtests
 * When no argument is given, tests for all supported distributions are run. You can restrict the
   tests by listing the desired distributions as arguments:
 ```bash
-python -m noisidev.runvmtests ubuntu-16.04
+venv/bin/python -m noisidev.runvmtests ubuntu-16.04
 ```
 
 * Once a the distribution has been installed in a VM, a snapshot called 'clean' is created. On
@@ -59,7 +58,7 @@ If inspecting the output is not sufficient to pin down the problem, you can rest
 state as it was after the test finished:
 
 ```bash
-python -m noisidev.runvmtests --just-start $DISTNAME
+venv/bin/python -m noisidev.runvmtests --just-start $DISTNAME
 ```
 
 Login as user `testuser` with passwork `123`, change into the `noiscaa` directory and active the
@@ -67,5 +66,4 @@ virtuenenv:
 
 ``` bash
 cd noisicaa/
-. ENV/bin/activate
 ```
diff --git a/noisidev/vmtests/ubuntu.py b/noisidev/vmtests/ubuntu.py
index faf89298..f93796f3 100644
--- a/noisidev/vmtests/ubuntu.py
+++ b/noisidev/vmtests/ubuntu.py
@@ -196,16 +196,11 @@ fi
 
 cd noisicaa/
 
-python3 -m venv ENV
-. ENV/bin/activate
+./waf configure
+./waf build
 
-sudo apt-get -q -y install $(./listdeps --system --build)
-pip install --upgrade pip wheel
-pip install $(./listdeps --pip --build)
-python3 setup.py build
-
-sudo apt-get -q -y install $(./listdeps --system --dev)
-pip install $(./listdeps --pip --dev)
+./waf configure --enable-tests
+./waf build
 bin/runtests --gdb=false
 '''