Allow Solidity build to be disabled.

This commit is contained in:
Gav Wood 2015-04-05 17:46:12 +02:00
parent 8afc2ab1e1
commit 966407f285
14 changed files with 44 additions and 5 deletions

View File

@ -20,6 +20,8 @@
* Unit tests for Assembly Items from evmcore/Assembly.h
*/
#if ETH_SOLIDITY
#include <string>
#include <iostream>
#include <boost/test/unit_test.hpp>
@ -119,3 +121,4 @@ BOOST_AUTO_TEST_SUITE_END()
}
} // end namespaces
#endif

View File

@ -44,7 +44,9 @@ target_link_libraries(testeth ${CURL_LIBRARIES})
target_link_libraries(testeth ethereum)
target_link_libraries(testeth ethcore)
target_link_libraries(testeth secp256k1)
target_link_libraries(testeth solidity)
if (SOLIDITY)
target_link_libraries(testeth solidity)
endif ()
target_link_libraries(testeth testutils)
if (NOT HEADLESS AND NOT JUSTTESTS)
target_link_libraries(testeth webthree)

View File

@ -19,6 +19,7 @@
* @date 2014
* Unit tests for the solidity compiler JSON Interface output.
*/
#if ETH_SOLIDITY
#include "TestHelper.h"
#include <libsolidity/CompilerStack.h>
@ -500,3 +501,5 @@ BOOST_AUTO_TEST_SUITE_END()
}
}
}
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for the solidity compiler.
*/
#if ETH_SOLIDITY
#include <string>
#include <iostream>
#include <boost/test/unit_test.hpp>
@ -192,3 +194,4 @@ BOOST_AUTO_TEST_SUITE_END()
}
} // end namespaces
#endif

View File

@ -1,4 +1,3 @@
/*
This file is part of cpp-ethereum.
@ -22,6 +21,8 @@
* Unit tests for the solidity expression compiler, testing the behaviour of the code.
*/
#if ETH_SOLIDITY
#include <string>
#include <tuple>
#include <boost/test/unit_test.hpp>
@ -3627,3 +3628,4 @@ BOOST_AUTO_TEST_SUITE_END()
}
} // end namespaces
#endif

View File

@ -1,4 +1,3 @@
/*
This file is part of cpp-ethereum.
@ -21,6 +20,8 @@
* Unit tests for the solidity expression compiler.
*/
#if ETH_SOLIDITY
#include <string>
#include <libdevcore/Log.h>
@ -491,3 +492,4 @@ BOOST_AUTO_TEST_SUITE_END()
}
} // end namespaces
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for generating source interfaces for Solidity contracts.
*/
#if ETH_SOLIDITY
#include "TestHelper.h"
#include <libsolidity/CompilerStack.h>
#include <libsolidity/AST.h>
@ -147,3 +149,5 @@ BOOST_AUTO_TEST_SUITE_END()
}
}
}
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for the name and type resolution of the solidity parser.
*/
#if ETH_SOLIDITY
#include <string>
#include <libdevcore/Log.h>
@ -1627,3 +1629,4 @@ BOOST_AUTO_TEST_SUITE_END()
}
} // end namespaces
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for the solidity compiler JSON Interface output.
*/
#if ETH_SOLIDITY
#include "TestHelper.h"
#include <json/json.h>
#include <libsolidity/CompilerStack.h>
@ -537,3 +539,5 @@ BOOST_AUTO_TEST_SUITE_END()
}
}
}
#endif

View File

@ -1,4 +1,3 @@
/*
This file is part of cpp-ethereum.
@ -21,6 +20,8 @@
* Tests for the Solidity optimizer.
*/
#if ETH_SOLIDITY
#include <string>
#include <tuple>
#include <boost/test/unit_test.hpp>
@ -573,3 +574,5 @@ BOOST_AUTO_TEST_SUITE_END()
}
}
} // end namespaces
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for the solidity parser.
*/
#if ETH_SOLIDITY
#include <string>
#include <memory>
#include <libdevcore/Log.h>
@ -845,3 +847,4 @@ BOOST_AUTO_TEST_SUITE_END()
}
} // end namespaces
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for the solidity scanner.
*/
#if ETH_SOLIDITY
#include <libsolidity/Scanner.h>
#include <boost/test/unit_test.hpp>
@ -286,3 +288,5 @@ BOOST_AUTO_TEST_SUITE_END()
}
}
} // end namespaces
#endif

View File

@ -20,6 +20,8 @@
* Unit tests for the type system of Solidity.
*/
#if ETH_SOLIDITY
#include <libsolidity/Types.h>
#include <boost/test/unit_test.hpp>
@ -91,3 +93,5 @@ BOOST_AUTO_TEST_SUITE_END()
}
}
}
#endif

View File

@ -1,4 +1,3 @@
/*
This file is part of cpp-ethereum.