Fixing path comparisons on Windows

pull/9995/head
Brian Daniels 2019-03-07 14:02:31 -06:00
parent 4cdc3b7cb8
commit 51c1bd35a0
1 changed files with 4 additions and 3 deletions

View File

@ -19,7 +19,7 @@ import os
import json import json
import pytest import pytest
from mock import patch from mock import patch
from os.path import join, isfile, dirname, abspath from os.path import join, isfile, dirname, abspath, normpath
from tools.build_api import get_config from tools.build_api import get_config
from tools.targets import set_targets_json_location from tools.targets import set_targets_json_location
from tools.config import ( from tools.config import (
@ -93,15 +93,16 @@ def test_config(name):
assert sorted(expected_features) == sorted(features) assert sorted(expected_features) == sorted(features)
included_source = [ included_source = [
join(test_dir, src) for src in normpath(join(test_dir, src)) for src in
expected.get("included_source", []) expected.get("included_source", [])
] ]
excluded_source = [ excluded_source = [
join(test_dir, src) for src in normpath(join(test_dir, src)) for src in
expected.get("excluded_source", []) expected.get("excluded_source", [])
] ]
for typ in Resources.ALL_FILE_TYPES: for typ in Resources.ALL_FILE_TYPES:
for _, path in resources.get_file_refs(typ): for _, path in resources.get_file_refs(typ):
path = normpath(path)
if included_source and path in included_source: if included_source and path in included_source:
included_source.remove(path) included_source.remove(path)
if excluded_source: if excluded_source: