From 14ba8b5df9728abd26fc6ce008b4e4a1ad3ceb96 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 28 Apr 2004 10:09:50 -0400 Subject: [PATCH] ENH: add a test for EQUAL in if --- Tests/Complex/Executable/complex.cxx | 12 ++++++++++++ Tests/Complex/VarTests.cmake | 14 ++++++++++++++ Tests/ComplexOneConfig/Executable/complex.cxx | 12 ++++++++++++ Tests/ComplexOneConfig/VarTests.cmake | 14 ++++++++++++++ Tests/ComplexRelativePaths/Executable/complex.cxx | 12 ++++++++++++ Tests/ComplexRelativePaths/VarTests.cmake | 14 ++++++++++++++ 6 files changed, 78 insertions(+) diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 5cbe51cf1..2d4bd51c7 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -425,6 +425,18 @@ int main() cmPassed("SHOULD_NOT_BE_DEFINED_GREATER is not defined."); #endif +#ifdef SHOULD_NOT_BE_DEFINED_EQUAL + cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_EQUAL is defined."); +#else + cmPassed("SHOULD_NOT_BE_DEFINED_EQUAL is not defined."); +#endif + +#ifndef SHOULD_BE_DEFINED_EQUAL + cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_EQUAL is not defined.\n"); +#else + cmPassed("SHOULD_BE_DEFINED_EQUAL is defined."); +#endif + #ifndef SHOULD_BE_DEFINED_GREATER cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_GREATER is not defined.\n"); #else diff --git a/Tests/Complex/VarTests.cmake b/Tests/Complex/VarTests.cmake index d9804a29c..477fab943 100644 --- a/Tests/Complex/VarTests.cmake +++ b/Tests/Complex/VarTests.cmake @@ -97,6 +97,8 @@ ENDIF (EXISTS ${Complex_SOURCE_DIR}/roquefort.txt) SET (SNUM1_VAR "1") SET (SNUM2_VAR "2") +SET (SNUM3_VAR "1") + IF (SNUM1_VAR LESS SNUM2_VAR) ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_LESS) @@ -116,6 +118,18 @@ ELSE (SNUM2_VAR GREATER SNUM1_VAR) ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_GREATER) ENDIF (SNUM2_VAR GREATER SNUM1_VAR) +IF (SNUM2_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_EQUAL) +ELSE (SNUM2_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_EQUAL) +ENDIF (SNUM2_VAR EQUAL SNUM1_VAR) + +IF (SNUM3_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_EQUAL) +ELSE (SNUM3_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_EQUAL) +ENDIF (SNUM3_VAR EQUAL SNUM1_VAR) + IF (SNUM1_VAR GREATER SNUM2_VAR) ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_GREATER2) ELSE (SNUM1_VAR GREATER SNUM2_VAR) diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 5cbe51cf1..2d4bd51c7 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -425,6 +425,18 @@ int main() cmPassed("SHOULD_NOT_BE_DEFINED_GREATER is not defined."); #endif +#ifdef SHOULD_NOT_BE_DEFINED_EQUAL + cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_EQUAL is defined."); +#else + cmPassed("SHOULD_NOT_BE_DEFINED_EQUAL is not defined."); +#endif + +#ifndef SHOULD_BE_DEFINED_EQUAL + cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_EQUAL is not defined.\n"); +#else + cmPassed("SHOULD_BE_DEFINED_EQUAL is defined."); +#endif + #ifndef SHOULD_BE_DEFINED_GREATER cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_GREATER is not defined.\n"); #else diff --git a/Tests/ComplexOneConfig/VarTests.cmake b/Tests/ComplexOneConfig/VarTests.cmake index d9804a29c..477fab943 100644 --- a/Tests/ComplexOneConfig/VarTests.cmake +++ b/Tests/ComplexOneConfig/VarTests.cmake @@ -97,6 +97,8 @@ ENDIF (EXISTS ${Complex_SOURCE_DIR}/roquefort.txt) SET (SNUM1_VAR "1") SET (SNUM2_VAR "2") +SET (SNUM3_VAR "1") + IF (SNUM1_VAR LESS SNUM2_VAR) ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_LESS) @@ -116,6 +118,18 @@ ELSE (SNUM2_VAR GREATER SNUM1_VAR) ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_GREATER) ENDIF (SNUM2_VAR GREATER SNUM1_VAR) +IF (SNUM2_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_EQUAL) +ELSE (SNUM2_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_EQUAL) +ENDIF (SNUM2_VAR EQUAL SNUM1_VAR) + +IF (SNUM3_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_EQUAL) +ELSE (SNUM3_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_EQUAL) +ENDIF (SNUM3_VAR EQUAL SNUM1_VAR) + IF (SNUM1_VAR GREATER SNUM2_VAR) ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_GREATER2) ELSE (SNUM1_VAR GREATER SNUM2_VAR) diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 5cbe51cf1..2d4bd51c7 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -425,6 +425,18 @@ int main() cmPassed("SHOULD_NOT_BE_DEFINED_GREATER is not defined."); #endif +#ifdef SHOULD_NOT_BE_DEFINED_EQUAL + cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_EQUAL is defined."); +#else + cmPassed("SHOULD_NOT_BE_DEFINED_EQUAL is not defined."); +#endif + +#ifndef SHOULD_BE_DEFINED_EQUAL + cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_EQUAL is not defined.\n"); +#else + cmPassed("SHOULD_BE_DEFINED_EQUAL is defined."); +#endif + #ifndef SHOULD_BE_DEFINED_GREATER cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_GREATER is not defined.\n"); #else diff --git a/Tests/ComplexRelativePaths/VarTests.cmake b/Tests/ComplexRelativePaths/VarTests.cmake index d9804a29c..477fab943 100644 --- a/Tests/ComplexRelativePaths/VarTests.cmake +++ b/Tests/ComplexRelativePaths/VarTests.cmake @@ -97,6 +97,8 @@ ENDIF (EXISTS ${Complex_SOURCE_DIR}/roquefort.txt) SET (SNUM1_VAR "1") SET (SNUM2_VAR "2") +SET (SNUM3_VAR "1") + IF (SNUM1_VAR LESS SNUM2_VAR) ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_LESS) @@ -116,6 +118,18 @@ ELSE (SNUM2_VAR GREATER SNUM1_VAR) ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_GREATER) ENDIF (SNUM2_VAR GREATER SNUM1_VAR) +IF (SNUM2_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_EQUAL) +ELSE (SNUM2_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_EQUAL) +ENDIF (SNUM2_VAR EQUAL SNUM1_VAR) + +IF (SNUM3_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_BE_DEFINED_EQUAL) +ELSE (SNUM3_VAR EQUAL SNUM1_VAR) + ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_EQUAL) +ENDIF (SNUM3_VAR EQUAL SNUM1_VAR) + IF (SNUM1_VAR GREATER SNUM2_VAR) ADD_DEFINITIONS(-DSHOULD_NOT_BE_DEFINED_GREATER2) ELSE (SNUM1_VAR GREATER SNUM2_VAR)