From 0a1b583392c568f246e39100997a15f26551eef9 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Thu, 24 Dec 2015 17:54:58 +0000
Subject: [PATCH] Fixed tests.

---
 src/nimblepkg/packageinfo.nim    | 2 +-
 tests/nimscript/nimscript.nimble | 3 ---
 tests/tester.nim                 | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/nimblepkg/packageinfo.nim b/src/nimblepkg/packageinfo.nim
index 39451ab..89e0d60 100644
--- a/src/nimblepkg/packageinfo.nim
+++ b/src/nimblepkg/packageinfo.nim
@@ -102,7 +102,7 @@ proc validatePackageInfo(pkgInfo: PackageInfo, path: string) =
 
   if pkgInfo.name.normalize != path.splitFile.name.normalize:
     raise newValidationError(
-        "The .nimble file name must match name specified inside it.", false)
+        "The .nimble file name must match name specified inside " & path, false)
 
   if pkgInfo.version == "":
     raise newValidationError("Incorrect .nimble file: " & path &
diff --git a/tests/nimscript/nimscript.nimble b/tests/nimscript/nimscript.nimble
index 2146e1e..59e6c41 100644
--- a/tests/nimscript/nimscript.nimble
+++ b/tests/nimscript/nimscript.nimble
@@ -13,6 +13,3 @@ requires "nim >= 0.12.1"
 
 task test, "test description":
   echo(5+5)
-
-task example, "Build and run examples for current platform":
-    setCommand "c"
\ No newline at end of file
diff --git a/tests/tester.nim b/tests/tester.nim
index 19173e6..9bb1369 100644
--- a/tests/tester.nim
+++ b/tests/tester.nim
@@ -70,13 +70,13 @@ test "issue #126":
     let (output, exitCode) = execCmdEx("../../" & path & " install")
     let lines = output.strip.splitLines()
     check exitCode != QuitSuccess
-    check "Invalid package name: cannot contain '-'" in lines[^1]
+    check "issue-126 is an invalid package name: cannot contain '-'" in lines[^1]
 
   cd "issue126/b":
     let (output1, exitCode1) = execCmdEx("../../" & path & " install")
     let lines1 = output1.strip.splitLines()
     check exitCode1 != QuitSuccess
-    check "The .nimble file name must match name specified inside it." in lines1[^1]
+    check "The .nimble file name must match name specified inside".normalize in lines1[^1].normalize
 
 test "issue #108":
   cd "issue108":