WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/makelib.pl2

                                 '%INSTALL_PROGS', '%INSTALL_SHLIBS');
 our @LINTLIBS               = ();
 our @LINTSHLIBS             = ();
-our @TESTS_TO_RUN           = ();
+our @TESTS_TO_RUN           = ();                           # Info from 'RunTest' directives
-our @TESTPROJECT_TO_URUN    = ();
+our @TESTPROJECT_TO_URUN    = ();                           # List of Unit Tests and Projects names (Non Auto)
-our @TESTPROJECT_TO_ARUN    = ();
+our @TESTPROJECT_TO_ARUN    = ();                           # List of Auto Tests and Projects names
-my  $TESTS_TO_AUTORUN       = undef;
+my  $TESTS_TO_AUTORUN       = undef;                        # Flag - Auto Test found
-my  $TESTS_TO_RUN           = undef;
+my  $TESTS_TO_RUN           = undef;                        # Flag - Unit Test found
 #our $CurrentTime           = "";
 #our $CurrentDate           = "";
 #our $Cwd                   = "";
     push ( @TESTS_TO_RUN, \%test_entry );
+    #
     #   Flag Auto Run processing required
+    #
+    $TESTS_TO_RUN = 1;
     $TESTS_TO_AUTORUN = 1 if ( $auto );
+}
 sub TestProg
     $PROJECTS{$proj}{'unittest'} = $unit_tests if ( $unit_tests );
     $PROJECTS{$proj}{'autotest'} = $auto_tests if ( $auto_tests );
     UniquePush (\@PROJECTS_ORDER, $proj);
     $TESTS_TO_AUTORUN = 1 if ( $auto_tests );
-    $TESTS_TO_RUN = 1 if ( $unit_tests || $auto_tests );
+    $TESTS_TO_RUN     = 1 if ( $unit_tests || $auto_tests );
+    #
     #   Validate some of the arguments
+    #
     Error ("MakeAnt. Conflicting options --Debug and --Prod" )
 #   Automated tests
+#
     MakeHeader ("Automated tests");
     my $idx = 0;
-    my @test_set;
-    my @test_set_auto;
     my @copy_set = ();
     foreach my $pEntry ( @TESTS_TO_RUN )
     {                                           # Foreach test
         $idx++;
         my $tdir_alias = $pEntry->{'testdir'};
         my $tdir = '$(' . $tdir_alias . ')';
         my $test_name = $pEntry->{'test_name'};
-        push @test_set, $test_name;
+        push @TESTPROJECT_TO_URUN, $test_name unless ($pEntry->{'auto'} );
-        push @test_set_auto, $test_name if ($pEntry->{'auto'} );
+        push @TESTPROJECT_TO_ARUN, $test_name if     ($pEntry->{'auto'} );
         my $tprog = $tdir . '/' . StripDir( $pEntry->{'prog'} );
         my $me = MakeEntry::New( *MAKEFILE, $test_name, '--Phony' );
         $me->AddDependancy( "\$(GBE_$tdir_alias)" );
+        }
+    }
+    #
-    #   Generate a target that specifies the tests to be run
-    #   Each test is provided with a dummy name
-    #
-    push @test_set, @TESTPROJECT_TO_ARUN;
-    push @test_set, @TESTPROJECT_TO_URUN;
-    if (@test_set)
-    {
-        unshift @test_set, 'makefile.pl';
-        MakeEntry3("\nrun_tests", ":", \@test_set );
-    }
-    push @test_set_auto, @TESTPROJECT_TO_ARUN;
-    if (@test_set_auto)
-    {
-        unshift @test_set_auto, 'makefile.pl';
-        MakeEntry3("\nrun_unit_tests", ":", \@test_set_auto );
-    }
-    #
     #   Generate sanity test for each copyin script
     #   Simply to provide a nice error message for generated scripts
     #   that do not exist at run-time
+    #
     test_copy_in:
 MakeDefEntry( "LINTPROGS",      "+=", CreateNameList( 'prog_', '_lint', \@TESTPROGS ));
 MakeDefEntry( "PROJECTS",        "=", CreateNameList( 'Project_', '', ListGeneratedProjects(1) ));
 MakeDefEntry( "PROJECTSGEN",     "=", CreateNameList( 'Project_', '', ListGeneratedProjects(0) ));
 MakeDefEntry( "PROJECTSCLEAN",   "=", CreateNameList( 'ProjectClean_', '', \%PROJECTS ));
+MakeDefEntry( "UNITTESTS",       "=", \@TESTPROJECT_TO_URUN );
+MakeDefEntry( "AUTOUNITTESTS",   "=", \@TESTPROJECT_TO_ARUN );
 MakeHeader ("Toolset components");
 MakeDefEntry( "USERGENERATED",        "=", \@USERGENERATED )    if ( @USERGENERATED );
 MakeDefEntry( "TOOLSETGENERATED",     "=", \@TOOLSETGENERATED ) if ( @TOOLSETGENERATED );
 MakeDefEntry( "TOOLSETOBJS",          "=", \@TOOLSETOBJS )      if ( @TOOLSETOBJS );
 MakeDefEntry( "TOOLSETLIBS",          "=", \@TOOLSETLIBS )      if ( @TOOLSETLIBS );
 my @unprogact;
 push @unprogact, RmFilesCmd( 'PROGS' )        if ( @PROGS );
 push @unprogact, RmFilesCmd( 'TOOLSETPROGS' ) if ( @TOOLSETPROGS );
+#
-#   Dependencies for 'lint_prog'
+#   Dependencies for 'run_tests'
+#
 my @testprogdep;
 push @testprogdep, '$(GBE_OBJDIR)', '$(GBE_BINDIR)', '$(TESTPROGS)' if ( @TESTPROGS );
+my @autoruntestdep;
+push @autoruntestdep, 'makefile.pl', '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN );
+my @runtestdep;
+push @runtestdep, 'makefile.pl'      if ( @TESTPROJECT_TO_URUN || @TESTPROJECT_TO_ARUN);
+push @runtestdep, '$(UNITTESTS)'     if ( @TESTPROJECT_TO_URUN);
+push @runtestdep, '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN);
+#
 #   Dependencies for 'run_tests' and friends
+#
 my @untestprogact;
 push @untestprogact ,RmFilesCmd( 'TESTPROGS' ) if ( @TESTPROGS );
 #   Will be invoked by the calling wrappers
 #   Should not be invoked when cleaning
+#
 PrintPhonyRule ('make_dir',       "@mkdirdep" );
 PrintPhonyRule ('generate',       "@generatedep @projectgendep" );
 PrintPhonyRule ('ungenerate',     "@ungeneratedep",  \@ungenact);
 PrintPhonyRule ('unobj',          "",  \@unobjact);
 PrintPhonyRule ('make_lib',       "@libdep" );
 PrintPhonyRule ('lint_lib',       "@liblintdep" );
 PrintPhonyRule ('lint_shlib',     "@shliblintdep" );
 PrintPhonyRule ('unmake_lib',     "", \@unlibact );
 PrintPhonyRule ('unmake_mlib',    "", \@unmlibact );
 PrintPhonyRule ('make_script',    "@scriptdep" );
 PrintPhonyRule ('unmake_script',  "", \@unscriptact );
-PrintPhonyRule ('make_prog',      "@scriptdep @progdep @projectdep" );
+PrintPhonyRule ('make_prog',      "make_script @progdep @projectdep" );
-PrintPhonyRule ('lint_prog',      "@proglintdep" );
-PrintPhonyRule ('run_tests',      "@scriptdep @testprogdep" );
-PrintPhonyRule ('run_unit_tests', "@scriptdep @testprogdep" );
 PrintPhonyRule ('unmake_prog',    "unmake_script @projectcleandep", \@unprogact );
+PrintPhonyRule ('lint_prog',      "@proglintdep" );
+PrintPhonyRule ('run_tests',      "make_script @testprogdep @runtestdep" );
+PrintPhonyRule ('run_unit_tests', "make_script @testprogdep @autoruntestdep" );
-PrintPhonyRule ('make_test',      "@scriptdep @testprogdep" );
+PrintPhonyRule ('make_test',      "make_script @testprogdep" );
 PrintPhonyRule ('unmake_test',    "unmake_script", \@untestprogact );
 #-------------------------------------------------------------------------------
 #   Package and Installation Summary
+#
     Maketag( "make_mlib",           @mlibdep );
     Maketag( "make_install_shlib",  %INSTALL_SHLIBS || @shlibdep);
     Maketag( "make_script",         @scriptdep );
     Maketag( "make_prog",           @progdep || @projectdep );
     Maketag( "make_test",           @testprogdep );
-    Maketag( "run_tests",           @TESTS_TO_RUN || @TESTPROJECT_TO_URUN || $TESTS_TO_RUN);
+    Maketag( "run_tests",           $TESTS_TO_RUN     || @TESTPROJECT_TO_URUN || $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
-    Maketag( "run_unit_tests",      $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN);
+    Maketag( "run_unit_tests",      $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
     Maketag( "install_hdr",         %INSTALL_HDRS );
     Maketag( "install_class",       %INSTALL_CLSS );
     Maketag( "install_lib",         %INSTALL_LIBS );
     Maketag( "install_prog",        %INSTALL_PROGS );
     Maketag( "deploy",              %DEPLOYPACKAGE );

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/makelib.pl2 – Rev 4455 → 4501