Subversion Repositories DevTools

Rev

Rev 4612 | Rev 4761 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4612 Rev 4728
Line 123... Line 123...
123
                                                # 0: Don't write progdeps. Prog is Phony
123
                                                # 0: Don't write progdeps. Prog is Phony
124
our $ScmToolsetSingleType   = 0;                # Toolset does not support Debug and Production
124
our $ScmToolsetSingleType   = 0;                # Toolset does not support Debug and Production
125
our $ScmToolsetProgSource   = ();               # Toolset Program Source
125
our $ScmToolsetProgSource   = ();               # Toolset Program Source
126
our $ScmToolsetSoName       = 0;                # 1: Shared library supports SoName
126
our $ScmToolsetSoName       = 0;                # 1: Shared library supports SoName
127
our $ScmToolsetNillLibSrc   = 0;                # 1: Librarys created without source specified
127
our $ScmToolsetNillLibSrc   = 0;                # 1: Librarys created without source specified
-
 
128
our $ScmToolsetProcessTests = 0;                # 1: Pre/Post process unit test runs
128
 
129
 
129
our $ScmRoot                = "";
130
our $ScmRoot                = "";
130
our $ScmMakelib             = "";
131
our $ScmMakelib             = "";
131
our $ScmPlatform            = "";
132
our $ScmPlatform            = "";
132
our $ScmMachType            = "";
133
our $ScmMachType            = "";
Line 9173... Line 9174...
9173
#
9174
#
9174
    MakeHeader ("Automated tests");
9175
    MakeHeader ("Automated tests");
9175
 
9176
 
9176
    my $idx = 0;
9177
    my $idx = 0;
9177
    my @copy_set = ();
9178
    my @copy_set = ();
-
 
9179
    
-
 
9180
    # 
-
 
9181
    #   Insert the three rules that surround test execution:
-
 
9182
    #    - preprocess_tests runs before any test has run
-
 
9183
    #    - postprocess_tests runs after all tests have run
-
 
9184
    #    - collate_test_results runs after all postprocess_tests have run
-
 
9185
    #
-
 
9186
    $if->PreprocessTests();
-
 
9187
    $if->PostprocessTests();
-
 
9188
    $if->CollateTestResults();
9178
 
9189
 
9179
    foreach my $pEntry ( @TESTS_TO_RUN )
9190
    foreach my $pEntry ( @TESTS_TO_RUN )
9180
    {                                           # Foreach test
9191
    {                                           # Foreach test
9181
        $idx++;
9192
        $idx++;
9182
        $pEntry->{'index'} = $idx;
9193
        $pEntry->{'index'} = $idx;
Line 9725... Line 9736...
9725
my @unprogact;
9736
my @unprogact;
9726
push @unprogact, RmFilesCmd( 'PROGS' )        if ( @PROGS );
9737
push @unprogact, RmFilesCmd( 'PROGS' )        if ( @PROGS );
9727
push @unprogact, RmFilesCmd( 'TOOLSETPROGS' ) if ( @TOOLSETPROGS );
9738
push @unprogact, RmFilesCmd( 'TOOLSETPROGS' ) if ( @TOOLSETPROGS );
9728
 
9739
 
9729
#
9740
#
9730
#   Dependencies for 'run_tests'
9741
#   Dependencies for 'exec_tests'
9731
#
9742
#
9732
my @testprogdep;
9743
my @testprogdep;
9733
push @testprogdep, '$(GBE_OBJDIR)', '$(GBE_BINDIR)', '$(TESTPROGS)' if ( @TESTPROGS );
9744
push @testprogdep, '$(GBE_OBJDIR)', '$(GBE_BINDIR)', '$(TESTPROGS)' if ( @TESTPROGS );
9734
 
9745
 
9735
my @autoruntestdep;
9746
my @autoruntestdep;
Line 9739... Line 9750...
9739
push @runtestdep, 'makefile.pl'      if ( @TESTPROJECT_TO_URUN || @TESTPROJECT_TO_ARUN);
9750
push @runtestdep, 'makefile.pl'      if ( @TESTPROJECT_TO_URUN || @TESTPROJECT_TO_ARUN);
9740
push @runtestdep, '$(UNITTESTS)'     if ( @TESTPROJECT_TO_URUN);
9751
push @runtestdep, '$(UNITTESTS)'     if ( @TESTPROJECT_TO_URUN);
9741
push @runtestdep, '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN);
9752
push @runtestdep, '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN);
9742
 
9753
 
9743
#
9754
#
9744
#   Dependencies for 'run_tests' and friends
9755
#   Dependencies for 'exec_tests' and friends
9745
#
9756
#
9746
my @untestprogact;
9757
my @untestprogact;
9747
push @untestprogact ,RmFilesCmd( 'TESTPROGS' ) if ( @TESTPROGS );
9758
push @untestprogact ,RmFilesCmd( 'TESTPROGS' ) if ( @TESTPROGS );
9748
 
9759
 
9749
#
9760
#
Line 9816... Line 9827...
9816
PrintPhonyRule ('make_script',    "@scriptdep" );
9827
PrintPhonyRule ('make_script',    "@scriptdep" );
9817
PrintPhonyRule ('unmake_script',  "", \@unscriptact );
9828
PrintPhonyRule ('unmake_script',  "", \@unscriptact );
9818
PrintPhonyRule ('make_prog',      "make_script @progdep @projectdep" );
9829
PrintPhonyRule ('make_prog',      "make_script @progdep @projectdep" );
9819
PrintPhonyRule ('unmake_prog',    "unmake_script @projectcleandep", \@unprogact );
9830
PrintPhonyRule ('unmake_prog',    "unmake_script @projectcleandep", \@unprogact );
9820
PrintPhonyRule ('lint_prog',      "@proglintdep" );
9831
PrintPhonyRule ('lint_prog',      "@proglintdep" );
9821
PrintPhonyRule ('run_tests',      "make_script @testprogdep @runtestdep" );
9832
PrintPhonyRule ('exec_tests',     "make_script @testprogdep @runtestdep" );
9822
PrintPhonyRule ('run_unit_tests', "make_script @testprogdep @autoruntestdep" );
9833
PrintPhonyRule ('exec_unit_tests',"make_script @testprogdep @autoruntestdep" );
9823
PrintPhonyRule ('make_test',      "make_script @testprogdep" );
9834
PrintPhonyRule ('make_test',      "make_script @testprogdep" );
9824
PrintPhonyRule ('unmake_test',    "unmake_script", \@untestprogact );
9835
PrintPhonyRule ('unmake_test',    "unmake_script", \@untestprogact );
9825
 
9836
 
9826
#-------------------------------------------------------------------------------
9837
#-------------------------------------------------------------------------------
9827
#   Package and Installation Summary
9838
#   Package and Installation Summary
Line 9955... Line 9966...
9955
    Maketag( "make_mlib",           @mlibdep );
9966
    Maketag( "make_mlib",           @mlibdep );
9956
    Maketag( "make_install_shlib",  %INSTALL_SHLIBS || @shlibdep);
9967
    Maketag( "make_install_shlib",  %INSTALL_SHLIBS || @shlibdep);
9957
    Maketag( "make_script",         @scriptdep );
9968
    Maketag( "make_script",         @scriptdep );
9958
    Maketag( "make_prog",           @progdep || @projectdep );
9969
    Maketag( "make_prog",           @progdep || @projectdep );
9959
    Maketag( "make_test",           @testprogdep );
9970
    Maketag( "make_test",           @testprogdep );
9960
    Maketag( "run_tests",           $TESTS_TO_RUN     || @TESTPROJECT_TO_URUN || $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
9971
    Maketag( "exec_tests",          $TESTS_TO_RUN     || @TESTPROJECT_TO_URUN || $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
9961
    Maketag( "run_unit_tests",      $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
9972
    Maketag( "exec_unit_tests",     $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
-
 
9973
    Maketag( "process_tests",       $ScmToolsetProcessTests );
9962
    Maketag( "install_hdr",         %INSTALL_HDRS );
9974
    Maketag( "install_hdr",         %INSTALL_HDRS );
9963
    Maketag( "install_class",       %INSTALL_CLSS );
9975
    Maketag( "install_class",       %INSTALL_CLSS );
9964
    Maketag( "install_lib",         %INSTALL_LIBS );
9976
    Maketag( "install_lib",         %INSTALL_LIBS );
9965
    Maketag( "install_prog",        %INSTALL_PROGS );
9977
    Maketag( "install_prog",        %INSTALL_PROGS );
9966
    Maketag( "deploy",              %DEPLOYPACKAGE );
9978
    Maketag( "deploy",              %DEPLOYPACKAGE );