From 6ed39950f2e435015f609620c2a3e6367d54b244 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Mon, 20 Jan 2014 22:26:03 -0500 Subject: [PATCH] Combine script now recognizes new index and combine test case names --- tools/combine | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/combine b/tools/combine index b8fd079..44de068 100755 --- a/tools/combine +++ b/tools/combine @@ -132,13 +132,10 @@ done # include tests? if [ "$INC_TEST" ]; then # note that not all tests are included - TEST_CASES=$( cd "$PATH_TEST"; find . \ - \( -name 'test-*.js' \ - -o -name '*Test*.js' \ - \) \ + TEST_CASES=$( cd "$PATH_TEST"; find . -name '*Test*.js' \ | sed 's/^.\///' \ | sort \ - | grep -v 'test-\(combine\(-pre-es5\)\?\|index\).js' \ + | grep -v '\(Combine\(PreEs5\)\?\|Index\)Test.js' \ ) # find include files separately so we can output those before the tests