From b95bdf4b619a59b11b84d8e60fc430ad283eef12 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 10 Apr 2017 17:45:53 +0300
Subject: Fix machine manifest tests

---
 bbot/manifest.cxx                  | 9 +++++++--
 tests/manifest/machine-header.test | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bbot/manifest.cxx b/bbot/manifest.cxx
index 52841f3..35e472c 100644
--- a/bbot/manifest.cxx
+++ b/bbot/manifest.cxx
@@ -625,8 +625,7 @@ namespace bbot
       throw parsing (p.name (), nv.name_line, nv.name_column, d);
     };
 
-    auto bad_value =
-      [&p, &nv] (const string& d, size_t offset = 0) [[noreturn]]
+    auto bad_value = [&p, &nv] (const string& d, size_t offset = 0)
     {
       throw parsing (p.name (), nv.value_line, nv.value_column + offset, d);
     };
@@ -642,6 +641,12 @@ namespace bbot
       {
         bad_value ("invalid " + what);
       }
+
+      // Can't be here. Would be redundant if it were possible to declare
+      // lambda with the [[noreturn]] attribute. Note that GCC (non-portably)
+      // supports that.
+      //
+      return result_status::abnormal;
     };
 
     // Make sure this is the start and we support the version.
diff --git a/tests/manifest/machine-header.test b/tests/manifest/machine-header.test
index 051f62f..f5f3c94 100644
--- a/tests/manifest/machine-header.test
+++ b/tests/manifest/machine-header.test
@@ -30,7 +30,7 @@ test.options += -m
 
 : multiple
 :
-$* <<EOI 2>'stdin:5:1: error: single machine manifest expected' == 1
+$* <<EOI 2>'stdin:5:1: error: single machine header manifest expected' == 1
 : 1
 id: a2b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 name: windows_10-msvc_14
@@ -93,7 +93,7 @@ EOI
 
 : unknown-name
 :
-$* <<EOI 2>"stdin:2:1: error: unknown name 'x' in machine manifest" == 1
+$* <<EOI 2>"stdin:2:1: error: unknown name 'x' in machine header manifest" == 1
 : 1
 x:
 EOI
-- 
cgit v1.1