let unit testing stuff build out of source

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8716 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/UnitTesting.cmake b/buildtools/Cmake/UnitTesting.cmake
index 49ff43f..152a2bb 100644 (file)
--- a/buildtools/Cmake/UnitTesting.cmake
+++ b/buildtools/Cmake/UnitTesting.cmake
@@ -15,19 +15,19 @@ set(TEST_CFILES
        src/xbt/xbt_synchro.c
 )
 set(TEST_UNITS
-       ${PROJECT_DIRECTORY}/src/cunit_unit.c
-       ${PROJECT_DIRECTORY}/src/ex_unit.c
-       ${PROJECT_DIRECTORY}/src/dynar_unit.c
-       ${PROJECT_DIRECTORY}/src/dict_unit.c
-       ${PROJECT_DIRECTORY}/src/set_unit.c
-       ${PROJECT_DIRECTORY}/src/swag_unit.c
-       ${PROJECT_DIRECTORY}/src/xbt_str_unit.c
-       ${PROJECT_DIRECTORY}/src/xbt_strbuff_unit.c
-       ${PROJECT_DIRECTORY}/src/xbt_sha_unit.c
-       ${PROJECT_DIRECTORY}/src/config_unit.c
-       ${PROJECT_DIRECTORY}/src/xbt_synchro_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/cunit_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/ex_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/dynar_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/dict_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/set_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/swag_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_str_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_strbuff_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_sha_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/config_unit.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_synchro_unit.c
        
-       ${PROJECT_DIRECTORY}/src/simgrid_units_main.c
+       ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_units_main.c
 )
 
 
@@ -42,18 +42,15 @@ if(PERL_EXECUTABLE)
        
                COMMAND ${CMAKE_COMMAND} -E remove -f ${TEST_UNITS}
        
-               COMMAND chmod a=rwx ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl
+               COMMAND chmod +x ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl
        
-               COMMAND ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${TEST_CFILES}
+               COMMAND ${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl --root=src/ --outdir=${CMAKE_CURRENT_BINARY_DIR}/src/ ${TEST_CFILES}
        
-               WORKING_DIRECTORY ${PROJECT_DIRECTORY}/src
+               WORKING_DIRECTORY ${PROJECT_DIRECTORY}
        
                COMMENT "Generating *_units files for testall..."
        )
        
-#              add_custom_target(units_files   
-#                      DEPENDS ${TEST_UNITS}
-#      )
        
 else(PERL_EXECUTABLE)
        ADD_CUSTOM_COMMAND(
@@ -72,7 +69,7 @@ endif(PERL_EXECUTABLE)
 
 set_source_files_properties(${TEST_UNITS} PROPERTIES GENERATED true)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/")
 add_executable(testall ${TEST_UNITS})
 
 ### Add definitions for compile

diff --git a/tools/sg_unit_extractor.pl b/tools/sg_unit_extractor.pl
index 6baa7b7..657b6a9 100755 (executable)
--- a/tools/sg_unit_extractor.pl
+++ b/tools/sg_unit_extractor.pl
@@ -3,6 +3,9 @@
 use strict;
 use Fcntl ':flock';
 
+use strict;
+use Getopt::Long qw(GetOptions);
+
 open SELF, "< $0" or die "Cannot open the lock file";
 if (!flock SELF, LOCK_EX | LOCK_NB) {
     print STDERR "sg_unit_extractor already running. Cancelling...\n";
@@ -11,8 +14,26 @@ if (!flock SELF, LOCK_EX | LOCK_NB) {
 
 my $progname="sg_unit_extractor";
 # Get the args 
-die "USAGE: $progname infile [infile+]\n"
-  if (scalar @ARGV == 0);
+
+sub usage($) {
+    my $ret;
+    print "USAGE: $progname [--root=part/to/cut] [--path=where/to/search NOT WORKING] [--outdir=where/to/generate/files] infile [infile+]\n";
+    exit $ret;
+}
+
+my $path=undef;
+my $outdir=undef;
+my $root;
+my $help;
+
+Getopt::Long::config('permute','no_getopt_compat', 'no_auto_abbrev');
+GetOptions(
+        'help|h'                => sub {usage(0)},
+        'root=s' =>\$root,
+        'path=s' =>\$path,
+        'outdir=s' =>\$outdir) or usage(1);
+
+usage(1) if (scalar @ARGV == 0);
 
 map {process_one($_)} @ARGV;
 
@@ -20,14 +41,14 @@ sub process_one($) {
     my $infile = shift;
     my $outfile;
     
-    print "$progname: processing $infile...\n";
-
     $infile =~ s|src/|| unless (-e $infile);
     
     $outfile =  $infile;
     $outfile =~ s/\.c$/_unit.c/;
     $outfile =~ s|.*/([^/]*)$|$1| if $outfile =~ m|/|;
+    $outfile = "$outdir$outfile";
     
+    print "$progname: processing $infile (generating $outfile)...\n";    
     
     # Get the unit data
     my ($unit_source,$suite_name,$suite_title)=("","","");
@@ -35,7 +56,8 @@ sub process_one($) {
     my (@tests); # actual content
     
     open IN, "$infile" || die "$progname: Cannot open input file '$infile': $!\n";
-
+    $infile =~ s|$root|| if defined($root);
+    
     my $takeit=0;
     my $line=0;
     my $beginline=0;
@@ -101,8 +123,8 @@ sub process_one($) {
     close OUT || die "$progname: Cannot close output file '$outfile': $!\n";
 
     # write the main skeleton if needed
-    if (! -e "simgrid_units_main.c") {
-       open OUT,">simgrid_units_main.c" || die "$progname: Cannot open main file 'simgrid_units_main.c': $!\n";
+    if (! -e "${outdir}simgrid_units_main.c") {
+       open OUT,">${outdir}simgrid_units_main.c" || die "$progname: Cannot open main file '${outdir}simgrid_units_main.c': $!\n";
        print OUT $GENERATED;
        print OUT "#include <stdio.h>\n\n";
        print OUT "#include \"xbt.h\"\n\n";
@@ -171,7 +193,7 @@ int main(int argc, char *argv[]) {
 }
 EOF
        print OUT $GENERATED;
-       close OUT || die "$progname: Cannot close main file 'simgrid_units_main.c': $!\n";
+       close OUT || die "$progname: Cannot close main file '${outdir}simgrid_units_main.c': $!\n";
     }
 
    print "  Suite $suite_name: $suite_title (".(scalar @tests)." tests)\n";
@@ -184,7 +206,7 @@ EOF
 
    # add this suite to the main
    my $newmain="";
-   open IN,"simgrid_units_main.c" || die "$progname: Cannot open main file 'simgrid_units_main.c': $!\n";
+   open IN,"${outdir}simgrid_units_main.c" || die "$progname: Cannot open main file '${outdir}simgrid_units_main.c': $!\n";
     # search prototypes
        while (<IN>) {
           $newmain .= $_;
@@ -258,12 +280,12 @@ EOF
        while (<IN>) {
           $newmain .= $_;
        }
-       close IN || die "$progname: Cannot close main file 'simgrid_units_main.c': $!\n";
+       close IN || die "$progname: Cannot close main file '${outdir}simgrid_units_main.c': $!\n";
        
        # write it back to main
-       open OUT,">simgrid_units_main.c" || die "$progname: Cannot open main file 'simgrid_units_main.c': $!\n";
+       open OUT,">${outdir}simgrid_units_main.c" || die "$progname: Cannot open main file '${outdir}simgrid_units_main.c': $!\n";
        print OUT $newmain;
-       close OUT || die "$progname: Cannot close main file 'simgrid_units_main.c': $!\n";
+       close OUT || die "$progname: Cannot close main file '${outdir}simgrid_units_main.c': $!\n";
 } # end if process_one($)
 
 0;