resolve #250

boyter · Dec 15, 2021 · 08974a2 · 08974a2
1 parent 8e72db4
commit 08974a2
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 20 deletions.
diff --git a/SCC-OUTPUT-REPORT.html b/SCC-OUTPUT-REPORT.html
@@ -12,12 +12,12 @@
 	<tbody><tr>
 		<th>Go</th>
 		<th>36</th>
-		<th>8881</th>
-		<th>1427</th>
-		<th>421</th>
-		<th>7033</th>
-		<th>1416</th>
-		<th>351626</th>
+		<th>8888</th>
+		<th>1428</th>
+		<th>422</th>
+		<th>7038</th>
+		<th>1417</th>
+		<th>351833</th>
 	</tr><tr>
 		<th>Java</th>
 		<th>24</th>
@@ -93,12 +93,12 @@
 	</tr><tr>
 		<th>Shell</th>
 		<th>3</th>
-		<th>1084</th>
-		<th>144</th>
+		<th>1097</th>
+		<th>145</th>
 		<th>85</th>
-		<th>855</th>
-		<th>95</th>
-		<th>39020</th>
+		<th>867</th>
+		<th>97</th>
+		<th>39410</th>
 	</tr><tr>
 		<th>C#</th>
 		<th>2</th>
@@ -381,12 +381,12 @@
 	</tr><tr>
 		<th>HTML</th>
 		<th>1</th>
-		<th>608</th>
+		<th>635</th>
 		<th>0</th>
 		<th>0</th>
-		<th>608</th>
+		<th>635</th>
 		<th>0</th>
-		<th>8880</th>
+		<th>9251</th>
 	</tr><tr>
 		<th>JSON</th>
 		<th>1</th>
@@ -607,11 +607,11 @@
 	<tfoot><tr>
 		<th>Total</th>
 		<th>176</th>
-		<th>26687</th>
-		<th>3023</th>
-		<th>1757</th>
-		<th>21907</th>
-		<th>2398</th>
-    	<th>1807755</th>
+		<th>26734</th>
+		<th>3025</th>
+		<th>1758</th>
+		<th>21951</th>
+		<th>2401</th>
+    	<th>1808723</th>
 	</tr></tfoot>
 	</table></body></html>
diff --git a/processor/processor.go b/processor/processor.go
@@ -280,6 +280,13 @@ func ProcessConstants() {
 			printTrace("configured to lazy load language features")
 		}
 	}
+
+	// Fix for https://github.com/boyter/scc/issues/250
+	fixedPath := []string{}
+	for _, path := range PathDenyList {
+		fixedPath = append(fixedPath, strings.TrimRight(path, "/"))
+	}
+	PathDenyList = fixedPath
 }
 
 // Configure and setup any count-as params the use has supplied

diff --git a/test-all.sh b/test-all.sh
@@ -835,6 +835,19 @@ else
     exit
 fi
 
+a=$(./scc --exclude-dir examples/)
+b=$(./scc --exclude-dir examples)
+if [ "$a" != "$b" ]; then
+    echo "$a"
+    echo "$b"
+    echo -e "${RED}======================================================="
+    echo -e "FAILED examples exclude-dir check"
+    echo -e "=================================================${NC}"
+    exit
+else
+    echo -e "${GREEN}PASSED examples exclude-dir check"
+fi
+
 # Try out specific languages
 for i in 'Bosque ' 'Flow9 ' 'Bitbucket Pipeline ' 'Docker ignore ' 'Q# ' 'Futhark ' 'Alloy ' 'Wren ' 'Monkey C ' 'Alchemist ' 'Luna ' 'ignore ' 'XML Schema ' 'Web Services' 'Go ' 'Java ' 'Boo ' 'License ' 'BASH ' 'C Shell ' 'Korn Shell ' 'Makefile ' 'Shell ' 'Zsh ' 'Rakefile ' 'Gemfile ' 'Dockerfile ' 'Yarn ' 'Sieve ' 'F# ' 'Elm ' 'Terraform ' 'Clojure ' 'C# ' 'LLVM IR ' 'HAML ' 'FXML ' 'DM ' 'Nushell ' 'Racket ' 'DOT '
 do