Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build spec links with short URLs for CSS testsuites #10248

Closed
wants to merge 2 commits into from
Closed

Build spec links with short URLs for CSS testsuites #10248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de277f7
Build spec links with short URLs for CSS testsuites
csnardi Mar 29, 2018
f0f68cc
Check that specName is in URLs
csnardi Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 51 additions & 30 deletions css/tools/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,35 @@ def _normalizeScheme(self, url):
return 'https:' + url[5:]
return url

def getSpecName(self, url):
def getSpecs(self, url):
if (not self.specNames):
for specName in self.specificationData:
specData = self.specificationData[specName]
shortName = specData.get('short_name')
officialURL = self._normalizeScheme(specData.get('base_uri'))
if (officialURL):
if (officialURL.endswith('/')):
officialURL = officialURL[:-1]
self.specNames[officialURL.lower()] = specName
self.specNames[officialURL.lower()] = [specName]

if specName in officialURL:
shortOfficialURL = officialURL.lower().replace(specName, shortName)
if (shortOfficialURL in self.specNames):
self.specNames[shortOfficialURL].append(specName)
else:
self.specNames[shortOfficialURL] = [specName]
draftURL = self._normalizeScheme(specData.get('draft_uri'))
if (draftURL):
if (draftURL.endswith('/')):
draftURL = draftURL[:-1]
self.specNames[draftURL.lower()] = specName
self.specNames[draftURL.lower()] = [specName]

if specName in draftURL:
shortDraftURL = draftURL.lower().replace(specName, shortName)
if (shortDraftURL in self.specNames):
self.specNames[shortDraftURL].append(specName)
else:
self.specNames[shortDraftURL] = [specName]
self.specAnchors[specName] = set()
if ('anchors' in specData):
self._addAnchors(specData['anchors'], specName)
Expand All @@ -108,11 +123,15 @@ def getSpecName(self, url):
anchorURL = url[len(specURL):]
if (anchorURL.startswith('/')):
anchorURL = anchorURL[1:]
specName = self.specNames[specURL]
if (anchorURL in self.specAnchors[specName]):
return (specName, anchorURL)
return (specName, None)
return (None, None)
specNames = self.specNames[specURL]
specNamesWithAnchors = []
for specName in specNames:
if (anchorURL in self.specAnchors[specName]):
specNamesWithAnchors.append((specName, anchorURL))
if len(specNamesWithAnchors) > 0:
return specNamesWithAnchors
return [(specName, None) for specName in specNames]
return [(None, None)]

def gatherTests(self, dir):
dirName = os.path.basename(dir)
Expand All @@ -139,28 +158,30 @@ def gatherTests(self, dir):
continue

for specURL in metaData['links']:
specName, anchorURL = self.getSpecName(specURL)
if not specName:
self.ui.note("Unknown specification URL: ", specURL, "\n in: ", filePath, "\n")
continue

if not specName in self.buildSpecNames:
continue

if not anchorURL:
self.ui.warn("Test links to unknown specification anchor: ", specURL, "\n in: ", filePath, "\n")
continue

for testSuiteName in self.buildSpecNames[specName]:
formats = self.testSuiteData[testSuiteName].get('formats')
if (formats):
for formatName in formats:
if (((formatName) in self.formatData) and
(self.formatData[formatName].get('mime_type') == source.mimetype)):
suiteFileNames[testSuiteName].add(fileName)
break
else:
self.ui.note("Test not in acceptable format: ", source.mimetype, "\n for: ", filePath, "\n")
specs = self.getSpecs(specURL)
for spec in specs:
specName, anchorURL = spec
if not specName:
self.ui.note("Unknown specification URL: ", specURL, "\n in: ", filePath, "\n")
continue

if not specName in self.buildSpecNames:
continue

if not anchorURL:
self.ui.warn("Test links to unknown specification anchor: ", specURL, "\n in: ", filePath, "\n")
continue

for testSuiteName in self.buildSpecNames[specName]:
formats = self.testSuiteData[testSuiteName].get('formats')
if (formats):
for formatName in formats:
if (((formatName) in self.formatData) and
(self.formatData[formatName].get('mime_type') == source.mimetype)):
suiteFileNames[testSuiteName].add(fileName)
break
else:
self.ui.note("Test not in acceptable format: ", source.mimetype, "\n for: ", filePath, "\n")

for testSuiteName in suiteFileNames:
if (dirName in self.rawDirs):
Expand Down