From ba072d5a6ec051debc5a86186f31fbfc9b21a34b Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Fri, 3 Aug 2012 15:23:40 +0200
Subject: [PATCH] ENH: set a different test launcher for tests needing
libsiftfast
---
.../Patented/otbPatentedExamplesTests.cxx | 10 -----
.../Patented/otbPatentedExamplesTests2.cxx | 39 +++++++++++++++++++
2 files changed, 39 insertions(+), 10 deletions(-)
create mode 100644 Examples/Patented/otbPatentedExamplesTests2.cxx
diff --git a/Examples/Patented/otbPatentedExamplesTests.cxx b/Examples/Patented/otbPatentedExamplesTests.cxx
index 96504515b8..12964a79c7 100644
--- a/Examples/Patented/otbPatentedExamplesTests.cxx
+++ b/Examples/Patented/otbPatentedExamplesTests.cxx
@@ -26,8 +26,6 @@ void RegisterTests()
{
REGISTER_TEST(HybridSegmentationFuzzyVoronoiTest);
REGISTER_TEST(EstimateAffineTransformationExampleTest);
- REGISTER_TEST(SIFTDisparityMapEstimationTest);
- REGISTER_TEST(SIFTFastExampleTest);
REGISTER_TEST(ScaleInvariantFeatureImageFilterTest);
}
@@ -39,14 +37,6 @@ void RegisterTests()
#define main EstimateAffineTransformationExampleTest
#include "EstimateAffineTransformationExample.cxx"
-#undef main
-#define main SIFTDisparityMapEstimationTest
-#include "SIFTDisparityMapEstimation.cxx"
-
#undef main
#define main ScaleInvariantFeatureImageFilterTest
#include "ScaleInvariantFeatureImageFilter.cxx"
-
-#undef main
-#define main SIFTFastExampleTest
-#include "SIFTFastExample.cxx"
diff --git a/Examples/Patented/otbPatentedExamplesTests2.cxx b/Examples/Patented/otbPatentedExamplesTests2.cxx
new file mode 100644
index 0000000000..8e98a51339
--- /dev/null
+++ b/Examples/Patented/otbPatentedExamplesTests2.cxx
@@ -0,0 +1,39 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+// this file defines the otbMultiScaleTest for the test driver
+// and all it expects is that you have a function called RegisterTests
+
+#include <iostream>
+#include "otbTestMain.h"
+
+void RegisterTests()
+{
+ REGISTER_TEST(SIFTDisparityMapEstimationTest);
+ REGISTER_TEST(SIFTFastExampleTest);
+}
+
+
+#undef main
+#define main SIFTDisparityMapEstimationTest
+#include "SIFTDisparityMapEstimation.cxx"
+
+
+#undef main
+#define main SIFTFastExampleTest
+#include "SIFTFastExample.cxx"
--
GitLab