Skip to content

Commit

Permalink
Move tests folder to pacify Swift 3's Package Manager.
Browse files Browse the repository at this point in the history
This involves moving a submodule. Sorry :(

Addresses most of nolanw#73.
  • Loading branch information
nolanw committed Jan 15, 2017
1 parent da151a6 commit b424ebc
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Tests/html5lib"]
path = Tests/html5lib
[submodule "HTMLReaderTests/html5lib"]
path = HTMLReaderTests/html5lib
url = git://github.com/html5lib/html5lib-tests.git
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [Unreleased]

* Move tests folder to support Swift 3's Package Manager.

## [2.0.2][]

* Fix retain cycle on documents created with `-[HTMLDocument initWithData:contentTypeHeader:]`.
Expand Down
17 changes: 10 additions & 7 deletions HTMLReader.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,8 @@
1C9C3ED5176BC53900E982C9 /* Info.plist */,
1C8829781836A0A80051653C /* Tests.xcconfig */,
);
path = Tests;
name = Tests;
path = HTMLReaderTests;
sourceTree = "<group>";
};
1CB15BB81A9A4AA000176E73 /* Selectors */ = {
Expand Down Expand Up @@ -1239,6 +1240,7 @@
};
0D1077811C1AC2DF00CF9B41 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1C8829781836A0A80051653C /* Tests.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -1259,7 +1261,7 @@
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = Tests/Info.plist;
INFOPLIST_FILE = HTMLReaderTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "ca.nolanw.HTMLReader-tvOSTests";
Expand All @@ -1271,6 +1273,7 @@
};
0D1077821C1AC2DF00CF9B41 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1C8829781836A0A80051653C /* Tests.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -1293,7 +1296,7 @@
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = Tests/Info.plist;
INFOPLIST_FILE = HTMLReaderTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "ca.nolanw.HTMLReader-tvOSTests";
Expand Down Expand Up @@ -1511,7 +1514,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = Tests/Info.plist;
INFOPLIST_FILE = HTMLReaderTests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "ca.nolanw.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
Expand Down Expand Up @@ -1539,7 +1542,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = Tests/Info.plist;
INFOPLIST_FILE = HTMLReaderTests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "ca.nolanw.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
Expand Down Expand Up @@ -1743,7 +1746,7 @@
buildSettings = {
CLANG_ENABLE_MODULES = NO;
FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks";
INFOPLIST_FILE = Tests/Info.plist;
INFOPLIST_FILE = HTMLReaderTests/Info.plist;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand All @@ -1762,7 +1765,7 @@
buildSettings = {
CLANG_ENABLE_MODULES = NO;
FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks";
INFOPLIST_FILE = Tests/Info.plist;
INFOPLIST_FILE = HTMLReaderTests/Info.plist;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Tests/Tests.xcconfig → HTMLReaderTests/Tests.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HTML5LIBTESTPATH="${SRCROOT}/Tests/html5lib"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HTML5LIBTESTPATH="${SRCROOT}/HTMLReaderTests/html5lib"
Submodule html5lib updated from 000000 to 2998f9
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ There are C libraries such as [Gumbo][] or [Hubbub][], but you need to shuffle d
## Does it work?
HTMLReader continually runs [html5lib][html5lib-tests]'s tokenization and tree construction tests, ignoring the tests for `<template>` (which HTMLReader does not implement). Note that you need to check out the `Tests/html5lib` Git submodule in order to actually run these tests.
HTMLReader continually runs [html5lib][html5lib-tests]'s tokenization and tree construction tests, ignoring the tests for `<template>` (which HTMLReader does not implement). Note that you need to check out the `HTMLReaderTests/html5lib` Git submodule in order to actually run these tests.
HTMLReader is continually built and tested on iOS versions 7.1, 8.4, 9.3, and 10.0; built and tested on macOS versions 10.9, 10.10, 10.11, and 10.12; built and tested on tvOS versions 9.2 and 10.0; and built on watchOS versions 2.2 and 3.0. It should work on down to iOS 5, macOS 10.7, tvOS 9.0, and watchOS 2.0, but there is no automated testing there (it's ok to file an issue though!).
Expand Down

0 comments on commit b424ebc

Please sign in to comment.