Commit e6448aa
test: use addon.md block headings as test dir names
instead of doc-*
PR-URL: #4412
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>1 parent 305d340 commit e6448aa
4 files changed
Lines changed: 25 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | lib/punycode.js | |
| 2 | - test/addons/doc-*/ | ||
| 2 | + test/addons/??_*/ | ||
| 3 | 3 | test/fixtures | |
| 4 | 4 | test/**/node_modules | |
| 5 | 5 | test/disabled | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -50,7 +50,7 @@ ipch/ | |||
| 50 | 50 | /npm.wxs | |
| 51 | 51 | /tools/msvs/npm.wixobj | |
| 52 | 52 | /tools/osx-pkg.pmdoc/index.xml | |
| 53 | - /test/addons/doc-*/ | ||
| 53 | + /test/addons/??_*/ | ||
| 54 | 54 | email.md | |
| 55 | 55 | deps/v8-* | |
| 56 | 56 | deps/icu | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -105,12 +105,12 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE) | |||
| 105 | 105 | ||
| 106 | 106 | # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. | |
| 107 | 107 | test/addons/.docbuildstamp: doc/api/addons.markdown | |
| 108 | - $(RM) -r test/addons/doc-*/ | ||
| 108 | + $(RM) -r test/addons/??_*/ | ||
| 109 | 109 | $(NODE) tools/doc/addon-verify.js | |
| 110 | 110 | touch $@ | |
| 111 | 111 | ||
| 112 | 112 | ADDONS_BINDING_GYPS := \ | |
| 113 | - $(filter-out test/addons/doc-*/binding.gyp, \ | ||
| 113 | + $(filter-out test/addons/??_*/binding.gyp, \ | ||
| 114 | 114 | $(wildcard test/addons/*/binding.gyp)) | |
| 115 | 115 | ||
| 116 | 116 | # Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale. | |
@@ -520,7 +520,7 @@ CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc | |||
| 520 | 520 | CPPLINT_EXCLUDE += src/queue.h | |
| 521 | 521 | CPPLINT_EXCLUDE += src/tree.h | |
| 522 | 522 | CPPLINT_EXCLUDE += src/v8abbr.h | |
| 523 | - CPPLINT_EXCLUDE += $(wildcard test/addons/doc-*/*.cc test/addons/doc-*/*.h) | ||
| 523 | + CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h) | ||
| 524 | 524 | ||
| 525 | 525 | CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \ | |
| 526 | 526 | deps/debugger-agent/include/* \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,31 +1,36 @@ | |||
| 1 | - var fs = require('fs'); | ||
| 2 | - var path = require('path'); | ||
| 3 | - var marked = require('marked'); | ||
| 1 | + 'use strict'; | ||
| 4 | 2 | ||
| 5 | - var doc = path.resolve(__dirname, '..', '..', 'doc', 'api', 'addons.markdown'); | ||
| 6 | - var verifyDir = path.resolve(__dirname, '..', '..', 'test', 'addons'); | ||
| 3 | + const fs = require('fs'); | ||
| 4 | + const path = require('path'); | ||
| 5 | + const marked = require('marked'); | ||
| 7 | 6 | ||
| 8 | - var contents = fs.readFileSync(doc).toString(); | ||
| 7 | + const doc = path.resolve(__dirname, '..', '..', 'doc', 'api', 'addons.markdown'); | ||
| 8 | + const verifyDir = path.resolve(__dirname, '..', '..', 'test', 'addons'); | ||
| 9 | 9 | ||
| 10 | - var tokens = marked.lexer(contents, {}); | ||
| 11 | - var files = null; | ||
| 12 | - var id = 0; | ||
| 10 | + const contents = fs.readFileSync(doc).toString(); | ||
| 11 | + | ||
| 12 | + let tokens = marked.lexer(contents, {}); | ||
| 13 | + let files = null; | ||
| 14 | + let blockName; | ||
| 15 | + let id = 0; | ||
| 13 | 16 | ||
| 14 | 17 | // Just to make sure that all examples will be processed | |
| 15 | 18 | tokens.push({ type: 'heading' }); | |
| 16 | 19 | ||
| 17 | 20 | var oldDirs = fs.readdirSync(verifyDir); | |
| 18 | 21 | oldDirs = oldDirs.filter(function(dir) { | |
| 19 | - return /^doc-/.test(dir); | ||
| 22 | + return /^\d{2}_/.test(dir); | ||
| 20 | 23 | }).map(function(dir) { | |
| 21 | 24 | return path.resolve(verifyDir, dir); | |
| 22 | 25 | }); | |
| 23 | 26 | ||
| 24 | 27 | for (var i = 0; i < tokens.length; i++) { | |
| 25 | 28 | var token = tokens[i]; | |
| 26 | - if (token.type === 'heading') { | ||
| 29 | + if (token.type === 'heading' && token.text) { | ||
| 30 | + blockName = token.text | ||
| 27 | 31 | if (files && Object.keys(files).length !== 0) { | |
| 28 | 32 | verifyFiles(files, | |
| 33 | + blockName, | ||
| 29 | 34 | console.log.bind(null, 'wrote'), | |
| 30 | 35 | function(err) { if (err) throw err; }); | |
| 31 | 36 | } | |
@@ -48,15 +53,16 @@ function once(fn) { | |||
| 48 | 53 | }; | |
| 49 | 54 | } | |
| 50 | 55 | ||
| 51 | - function verifyFiles(files, onprogress, ondone) { | ||
| 52 | - var dir = path.resolve(verifyDir, 'doc-' + id++); | ||
| 53 | - | ||
| 56 | + function verifyFiles(files, blockName, onprogress, ondone) { | ||
| 54 | 57 | // must have a .cc and a .js to be a valid test | |
| 55 | 58 | if (!Object.keys(files).some((name) => /\.cc$/.test(name)) || | |
| 56 | 59 | !Object.keys(files).some((name) => /\.js$/.test(name))) { | |
| 57 | 60 | return; | |
| 58 | 61 | } | |
| 59 | 62 | ||
| 63 | + blockName = blockName.toLowerCase().replace(/\s/g, '_').replace(/[^a-z\d_]/g, '') | ||
| 64 | + let dir = path.resolve(verifyDir, `${(++id < 10 ? '0' : '') + id}_${blockName}`); | ||
| 65 | + | ||
| 60 | 66 | files = Object.keys(files).map(function(name) { | |
| 61 | 67 | return { | |
| 62 | 68 | path: path.resolve(dir, name), | |
0 commit comments