Subversion Repositories DevTools

Rev

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

Rev 6504 Rev 6619
Line 6590... Line 6590...
6590
    my( $name, $stripCount) = @_;
6590
    my( $name, $stripCount) = @_;
6591
 
6591
 
6592
    if ($stripCount)
6592
    if ($stripCount)
6593
    {
6593
    {
6594
        $name =~ s~\\~/~g;
6594
        $name =~ s~\\~/~g;
6595
        $name =~ s~//~~g;
6595
        $name =~ s~//~/~g;
6596
 
6596
 
6597
        my @items = split('/', $name);
6597
        my @items = split('/', $name);
6598
        if ($stripCount > 0)
6598
        if ($stripCount > 0)
6599
        {
6599
        {
6600
            my $len = scalar @items;
6600
            my $len = scalar @items;
Line 9863... Line 9863...
9863
        #   Export GBE_UTF... for the duration of the test
9863
        #   Export GBE_UTF... for the duration of the test
9864
        #
9864
        #
9865
        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
9865
        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
9866
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
9866
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
9867
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
9867
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
-
 
9868
        $me->AddDefn('export GBE_UTFTEST','TEST-$(GBE_UTFNAME)-$(GBE_TYPE)-$(GBE_UTFUID)' );
-
 
9869
 
-
 
9870
        #
-
 
9871
        #   A bit of a kludge for 'googletest'
-
 
9872
        #       If we have another kludge like then then consider placing this work into a module based on the filter name
-
 
9873
        #       with some sort of interface to allow the ENVvars and format and command line args to be massaged
-
 
9874
        #       
-
 
9875
        #   For googletest
-
 
9876
        #       Set EnvVar and then prost process with junit
-
 
9877
        #
-
 
9878
        if ($pEntry->{'utfformat'} || '' eq 'gtest') {
-
 
9879
            $pEntry->{'utfformat'} = 'junit';
-
 
9880
            $me->AddDefn('export GTEST_OUTPUT ', 'xml:${GBE_UTFTEST}.xml');
-
 
9881
        }
9868
 
9882
 
9869
        # Workaround for dirsep under windows when being wrapped in a timeout
9883
        # Workaround for dirsep under windows when being wrapped in a timeout
9870
        $me->AddDefn('dirsep', '$(dirsep)$(dirsep)') if ($timeout && ($::ScmHost ne "Unix"));
9884
        $me->AddDefn('dirsep', '$(dirsep)$(dirsep)') if ($timeout && ($::ScmHost ne "Unix"));
9871
 
9885
 
9872
        $me->AddDependancy( "\$(GBE_$tdir_alias)" );
9886
        $me->AddDependancy( "\$(GBE_$tdir_alias)" );