Merge pull request #271 from ethereum/missing-single

Support running tests even if compileJSON is missing

Author: axic

test/package.js

@@ -48,6 +48,11 @@ tape('Version and license', function (t) {
 
 tape('Compilation', function (t) {
   t.test('single files can be compiled', function (st) {
+    if (!solc.supportsSingle) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
     var output = solc.compile('contract x { function g() public {} }');
     st.ok('contracts' in output);
     var bytecode = getBytecode(output, '', 'x');
@@ -71,6 +76,11 @@ tape('Compilation', function (t) {
   });
 
   t.test('invalid source code fails properly', function (st) {
+    if (!solc.supportsSingle) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
     var output = solc.compile('contract x { this is an invalid contract }');
     if (semver.lt(solc.semver(), '0.1.4')) {
       st.ok(output.error.indexOf('Parser error: Expected identifier') !== -1);
@@ -104,6 +114,12 @@ tape('Compilation', function (t) {
       return;
     }
 
+    if (!solc.supportsMulti) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
+
     var input = {
       'lib.sol': 'library L { function f() public returns (uint) { return 7; } }',
       'cont.sol': 'import "lib.sol"; contract x { function g() public { L.f(); } }'
@@ -146,6 +162,12 @@ tape('Compilation', function (t) {
       return;
     }
 
+    if (!solc.supportsImportCallback) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
+
     var input = {
       'cont.sol': 'import "lib.sol"; contract x { function g() public { L.f(); } }'
     };
@@ -200,6 +222,12 @@ tape('Compilation', function (t) {
       return;
     }
 
+    if (!solc.supportsImportCallback) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
+
     var input = {
       'cont.sol': 'import "lib.sol"; contract x { function g() public { L.f(); } }'
     };
@@ -229,6 +257,12 @@ tape('Compilation', function (t) {
       return;
     }
 
+    if (!solc.supportsImportCallback) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
+
     var input = {
       'cont.sol': 'import "lib.sol"; contract x { function g() public { L.f(); } }'
     };
@@ -248,6 +282,12 @@ tape('Compilation', function (t) {
       return;
     }
 
+    if (!solc.supportsImportCallback) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
+
     var input = {
       'cont.sol': 'import "lib.sol"; contract x { function g() public { L.f(); } }'
     };
@@ -264,6 +304,12 @@ tape('Compilation', function (t) {
       return;
     }
 
+    if (!solc.supportsImportCallback) {
+      st.skip('Not supported by solc');
+      st.end();
+      return;
+    }
+
     var input = {
       'cont.sol': 'import "lib.sol"; contract x { function g() public { L.f(); } }'
     };
@@ -539,6 +585,11 @@ tape('Loading Legacy Versions', function (t) {
         st.end();
         return;
       }
+      if (!solcSnapshot.supportsSingle) {
+        st.skip('Not supported by solc');
+        st.end();
+        return;
+      }
       var output = solcSnapshot.compile('contract x { function g() public {} }');
       st.ok(':x' in output.contracts);
       st.ok(output.contracts[':x'].bytecode.length > 0);

wrapper.js

@@ -233,6 +233,7 @@ function setupMethods (soljson) {
     compile: compile,
     compileStandard: compileStandard,
     compileStandardWrapper: compileStandardWrapper,
+    supportsSingle: compileJSON !== null,
     supportsMulti: compileJSONMulti !== null,
     supportsImportCallback: compileJSONCallback !== null,
     supportsStandard: compileStandard !== null,