From d63d41b3b545b0e13e2ee7f880120b2ba852c654 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 14 Mar 2018 12:04:04 +0100
Subject: test: Rename test/TestHelper.* to test/Options.* and add
 Options::validate().

---
 test/libsolidity/InlineAssembly.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/libsolidity/InlineAssembly.cpp')

diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index a4dcc4d5..34ca33e3 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -20,7 +20,7 @@
  * Unit tests for inline assembly.
  */
 
-#include "../TestHelper.h"
+#include <test/Options.h>
 
 #include <libsolidity/interface/AssemblyStack.h>
 #include <libsolidity/parsing/Scanner.h>
-- 
cgit v1.2.3


From 2e73ef5ac5db406e86e3a90c89d3be4b0d666073 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 6 Apr 2018 14:48:17 +0200
Subject: Ignore shift warnings on constantinople tests

---
 test/libsolidity/InlineAssembly.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/libsolidity/InlineAssembly.cpp')

diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index 34ca33e3..0ced1792 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -783,6 +783,8 @@ BOOST_AUTO_TEST_CASE(shift)
 
 BOOST_AUTO_TEST_CASE(shift_constantinople_warning)
 {
+	if (dev::test::Options::get().evmVersion().hasBitwiseShifting())
+		return;
 	CHECK_PARSE_WARNING("{ pop(shl(10, 32)) }", Warning, "The \"shl\" instruction is only available for Constantinople-compatible VMs.");
 	CHECK_PARSE_WARNING("{ pop(shr(10, 32)) }", Warning, "The \"shr\" instruction is only available for Constantinople-compatible VMs.");
 	CHECK_PARSE_WARNING("{ pop(sar(10, 32)) }", Warning, "The \"sar\" instruction is only available for Constantinople-compatible VMs.");
-- 
cgit v1.2.3