From 4e13f780f188440c83d7b0c095aec05c93ea636c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 7 Jun 2019 16:00:37 +0200
Subject: [PATCH] [libcalamares] Expand tests for runCommand

 - try both with and without a working-directory set, this would have
   shown up the problem with bad indentation much earlier.
---
 src/libcalamares/Tests.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/Tests.cpp b/src/libcalamares/Tests.cpp
index 40cb480e9..3b7624537 100644
--- a/src/libcalamares/Tests.cpp
+++ b/src/libcalamares/Tests.cpp
@@ -132,5 +132,29 @@ LibCalamaresTests::testCommands()
     QVERIFY( tf.open() );
     QVERIFY( !tf.fileName().isEmpty() );
 
-    QVERIFY( r.getOutput().contains( tf.fileName() ) );
+    QFileInfo tfn( tf.fileName() );
+    QVERIFY( !r.getOutput().contains( tfn.fileName() ) );
+
+    // Run ls again, now that the file exists
+    r = System::runCommand(
+        System::RunLocation::RunInHost,
+        { "/bin/ls", "/tmp" }
+        );
+    QVERIFY( r.getOutput().contains( tfn.fileName() ) );
+
+    // .. and without a working directory set, assume builddir != /tmp
+    r = System::runCommand(
+        System::RunLocation::RunInHost,
+        { "/bin/ls" }
+        );
+    QVERIFY( !r.getOutput().contains( tfn.fileName() ) );
+
+    r = System::runCommand(
+        System::RunLocation::RunInHost,
+        { "/bin/ls" },
+        "/tmp"
+        );
+    QVERIFY( r.getOutput().contains( tfn.fileName() ) );
+
+
 }