diff options
| author | Steven Perron <stevenperron@google.com> | 2018-10-04 10:00:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 10:00:11 -0400 |
| commit | c4c68712c4bb9da275dc70b0d6435aa8821bd138 (patch) | |
| tree | 4857beb998f707c6c06abc367e8e20728bb46fed /test/opt/fold_test.cpp | |
| parent | 19c07731fce3073ea85e4f3e8759d9662b606f56 (diff) | |
| download | spirv-tools-c4c68712c4bb9da275dc70b0d6435aa8821bd138.tar.gz | |
Make EFFCEE required (#1943)
Fixes #1912.
Remove the non-effcee build as EFFCEE is now required.
Diffstat (limited to 'test/opt/fold_test.cpp')
| -rw-r--r-- | test/opt/fold_test.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/test/opt/fold_test.cpp b/test/opt/fold_test.cpp index b1e57588..e4dabe85 100644 --- a/test/opt/fold_test.cpp +++ b/test/opt/fold_test.cpp @@ -17,6 +17,7 @@ #include <unordered_set> #include <vector> +#include "effcee/effcee.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "source/opt/build_module.h" @@ -27,17 +28,12 @@ #include "spirv-tools/libspirv.hpp" #include "test/opt/pass_utils.h" -#ifdef SPIRV_EFFCEE -#include "effcee/effcee.h" -#endif - namespace spvtools { namespace opt { namespace { using ::testing::Contains; -#ifdef SPIRV_EFFCEE std::string Disassemble(const std::string& original, IRContext* context, uint32_t disassemble_options = 0) { std::vector<uint32_t> optimized_bin; @@ -60,7 +56,6 @@ void Match(const std::string& original, IRContext* context, << match_result.message() << "\nChecking result:\n" << disassembly; } -#endif template <class ResultType> struct InstructionFoldingCase { @@ -3851,7 +3846,6 @@ INSTANTIATE_TEST_CASE_P(DoubleRedundantSubFoldingTest, ToNegateFoldingTest, 2, 3) )); -#ifdef SPIRV_EFFCEE using MatchingInstructionFoldingTest = ::testing::TestWithParam<InstructionFoldingCase<bool>>; @@ -6075,7 +6069,6 @@ INSTANTIATE_TEST_CASE_P(VectorShuffleMatchingTest, MatchingInstructionWithNoResu "OpFunctionEnd", 9, true) )); -#endif } // namespace } // namespace opt |