GNU
/
easejs
1
0
Fork 0
Code Releases Activity

[#25] Adding proper dirname to combined tests

closure/master
Mike Gerwitz 2011-10-23 00:13:53 -04:00
parent 9b629b8b61
commit 0d0372cb87
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/combine
View File

@ -142,7 +142,11 @@ if [ "$INC_TEST" ]; then
) )
# find include files separately so we can output those before the tests # find include files separately so we can output those before the tests
TEST_INC=$( find $PATH_TEST -name 'inc-*.js' -exec basename {} \; ) TEST_INC=$(
cd "$PATH_TEST" \
&& find . -name 'inc-*.js' \
| sed 's/^\.\///' \
)
# include test combine template # include test combine template
cat "$TPL_TEST_PATH" | grep -v '^#' | $RMTRAIL cat "$TPL_TEST_PATH" | grep -v '^#' | $RMTRAIL
@ -158,6 +162,7 @@ if [ "$INC_TEST" ]; then
# prefixing it with "test/" # prefixing it with "test/"
module="${filename%.*}" module="${filename%.*}"
module="test/${module##*test/}" module="test/${module##*test/}"
module_dir=$( dirname "$module" )
# each module must be enclosed in a closure to emulate a module # each module must be enclosed in a closure to emulate a module
echo "/** TEST CASE: $testcase **/" echo "/** TEST CASE: $testcase **/"
@ -172,7 +177,7 @@ if [ "$INC_TEST" ]; then
# add the module, removing trailing commas # add the module, removing trailing commas
cat $filename | $RMTRAIL cat $filename | $RMTRAIL
echo "} )( module['$module'] = {}, 'test' );" echo "} )( module['$module'] = {}, '$module_dir' );"
done done
echo "};" echo "};"

5
tools/combine.tpl
View File

@ -41,9 +41,8 @@ var easejs = {};
var require = function( module_id ) var require = function( module_id )
{ {
// remove the './' directory prefix (every module is currently included // remove the './' directory prefix (every module is currently included
// via a relative path) and stupidly remove single ../'s (combine script // via a relative path), stupidly remove ../'s and remove .js extensions
// doesn't include true paths, so they're not necessary to resolve) var id_clean = module_id.replace( /^\.?\/|[^/]*?\/\.\.\/|\.js$/, '' );
var id_clean = module_id.replace( /^\.?\/|\.\.\//, '' );
// attempt to retrieve the module // attempt to retrieve the module
var mod = module[ id_clean ]; var mod = module[ id_clean ];