merge development

1 files changed, 22 insertions, 0 deletions

diff --git a/packages/sol-tracing-utils/test/fixtures/contracts/SolcovIgnore.sol b/packages/sol-tracing-utils/test/fixtures/contracts/SolcovIgnore.sol
new file mode 100644
index 000000000..a7977ffb4
--- /dev/null
+++ b/packages/sol-tracing-utils/test/fixtures/contracts/SolcovIgnore.sol
@@ -0,0 +1,22 @@
+pragma solidity ^0.4.21;
+
+contract SolcovIgnore {
+    uint public storedData;
+
+    function set(uint x) public {
+        /* solcov ignore next */
+        storedData = x;
+    }
+
+    /* solcov ignore next */
+    function get() constant public returns (uint retVal) {
+        return storedData;
+    }
+}
+
+/* solcov ignore next */
+contract Ignore {
+    function ignored() public returns (bool) {
+        return false;
+    }
+}