From 99fe270e59b44526b43f2b8d93d51b20d45b62d3 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Sun, 20 Apr 2014 11:59:41 +0200 Subject: Fix #267 (code path regression) Since the introduction of -r/--recursive, deps were not properly added to the code path when running ct, eunit, etc. To fix that, pass a flag down to process_dir1 and conditionalize execution of the command. This moves the decision into process_dir1 where we can decide to invoke preprocess/2 and postprocess/2 but not execute the command. Without this fix, you'd have to, for example, invoke 'rebar -r ct skip_deps=true', if you wanted to run base_dir's ct suites with deps on the code path (while skipping all non-base_dir ct suites). So, with this patch applied, if you run $ rebar ct deps will be on the code path, and only base_dir's ct suites will be tested. If you want to test ct suites in base_dir and sub_dirs, you have to run $ rebar -r ct skip_deps=true If you want to test ct suites in all dirs, you have to run $ rebar -r ct The fix is not specific to ct and applies to all commands. To be able to add inttest/code_path_no_recurse/deps, I had to fix .gitignore. While at it, I've updated and fixed all entries. --- .gitignore | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 165948e..15668a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,11 @@ -*.beam -rebar +/ebin/*.beam +/rebar *~ *.orig .*.swp -rt.work -.test -dialyzer_warnings -rebar.cmd -.eunit -deps -.rebar/* +/rt.work +/dialyzer_warnings +/rebar.cmd +/.eunit +/deps +/.rebar -- cgit v1.2.1