aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorgalik <galik@localhost>2016-08-09 15:04:58 +0100
committergalik <galik@localhost>2016-08-09 15:04:58 +0100
commitf6cc5798a17daccf806bbc402a67c92d1a205091 (patch)
tree4e92691922c3fbbed643f05081a82f3e1c596a01 /tests
parentefeb557bf113c663261468f442d97cc656d05405 (diff)
downloadplatform_external_Microsoft-GSL-f6cc5798a17daccf806bbc402a67c92d1a205091.tar.gz
platform_external_Microsoft-GSL-f6cc5798a17daccf806bbc402a67c92d1a205091.tar.bz2
platform_external_Microsoft-GSL-f6cc5798a17daccf806bbc402a67c92d1a205091.zip
Renamed include/ folder to gsl/ to make including the library consistent
whether using it from the development folder, from the installation folder or from being copied into a project. #include <gsl/gsl.h> Updated headers/tests/instructions/cmake build accordingly This PR should address https://github.com/Microsoft/GSL/issues/277 (less the renaming of gsl itself)
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/assertion_tests.cpp2
-rw-r--r--tests/at_tests.cpp2
-rw-r--r--tests/bounds_tests.cpp2
-rw-r--r--tests/byte_tests.cpp2
-rw-r--r--tests/multi_span_tests.cpp2
-rw-r--r--tests/notnull_tests.cpp2
-rw-r--r--tests/owner_tests.cpp2
-rw-r--r--tests/span_tests.cpp2
-rw-r--r--tests/strided_span_tests.cpp2
-rw-r--r--tests/string_span_tests.cpp2
-rw-r--r--tests/utils_tests.cpp2
12 files changed, 13 insertions, 13 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 79931f7..4a59470 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
add_subdirectory(unittest-cpp)
include_directories(
- ../include
+ ..
./unittest-cpp
)
@@ -33,7 +33,7 @@ else()
endif()
function(add_gsl_test name)
- add_executable(${name} ${name}.cpp ../include/gsl.h ../include/gsl_assert.h ../include/gsl_util.h ../include/multi_span.h ../include/span.h ../include/string_span.h)
+ add_executable(${name} ${name}.cpp ../gsl/gsl.h ../gsl/gsl_assert.h ../gsl/gsl_util.h ../gsl/multi_span.h ../gsl/span.h ../gsl/string_span.h)
target_link_libraries(${name} UnitTest++)
install(TARGETS ${name}
RUNTIME DESTINATION bin
diff --git a/tests/assertion_tests.cpp b/tests/assertion_tests.cpp
index acd381a..4ac1856 100644
--- a/tests/assertion_tests.cpp
+++ b/tests/assertion_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <gsl.h>
+#include <gsl/gsl.h>
using namespace gsl;
diff --git a/tests/at_tests.cpp b/tests/at_tests.cpp
index 1a9f814..53d93d1 100644
--- a/tests/at_tests.cpp
+++ b/tests/at_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <gsl.h>
+#include <gsl/gsl.h>
#include <vector>
#include <initializer_list>
diff --git a/tests/bounds_tests.cpp b/tests/bounds_tests.cpp
index 736a85c..7d5a071 100644
--- a/tests/bounds_tests.cpp
+++ b/tests/bounds_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <multi_span.h>
+#include <gsl/multi_span.h>
#include <vector>
using namespace std;
diff --git a/tests/byte_tests.cpp b/tests/byte_tests.cpp
index 5d4e7f6..183bebf 100644
--- a/tests/byte_tests.cpp
+++ b/tests/byte_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <gsl_byte.h>
+#include <gsl/gsl_byte.h>
#include <iostream>
#include <list>
diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp
index 003d236..b2e5b5f 100644
--- a/tests/multi_span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <multi_span.h>
+#include <gsl/multi_span.h>
#include <iostream>
#include <list>
diff --git a/tests/notnull_tests.cpp b/tests/notnull_tests.cpp
index 67b478a..bc12e9b 100644
--- a/tests/notnull_tests.cpp
+++ b/tests/notnull_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <gsl.h>
+#include <gsl/gsl.h>
#include <vector>
using namespace gsl;
diff --git a/tests/owner_tests.cpp b/tests/owner_tests.cpp
index 47c223a..3c82022 100644
--- a/tests/owner_tests.cpp
+++ b/tests/owner_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <gsl.h>
+#include <gsl/gsl.h>
#include <functional>
using namespace gsl;
diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index 8c9829d..fb20f77 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <span.h>
+#include <gsl/span.h>
#include <iostream>
#include <list>
diff --git a/tests/strided_span_tests.cpp b/tests/strided_span_tests.cpp
index b81a5e7..4c07670 100644
--- a/tests/strided_span_tests.cpp
+++ b/tests/strided_span_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <multi_span.h>
+#include <gsl/multi_span.h>
#include <string>
#include <vector>
diff --git a/tests/string_span_tests.cpp b/tests/string_span_tests.cpp
index 876886a..fbaa9e8 100644
--- a/tests/string_span_tests.cpp
+++ b/tests/string_span_tests.cpp
@@ -16,7 +16,7 @@
#include <UnitTest++/UnitTest++.h>
#include <cstdlib>
-#include <string_span.h>
+#include <gsl/string_span.h>
#include <vector>
using namespace std;
diff --git a/tests/utils_tests.cpp b/tests/utils_tests.cpp
index 11582de..8c98223 100644
--- a/tests/utils_tests.cpp
+++ b/tests/utils_tests.cpp
@@ -15,7 +15,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <UnitTest++/UnitTest++.h>
-#include <gsl.h>
+#include <gsl/gsl.h>
#include <functional>
using namespace gsl;