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

 our %ScmSourceTypes         = ();
 our $ScmDeploymentPatch     = "";
 our $ProjectBase            = "";               # Base of the user's project
 our $ScmNoToolsTest         = "";               # Supress compiler tests
 our $ScmDependTags          = 0;                # Create dependancy scanning tag
+our $ScmMakeUid;                                # Unique makefile id (number 1 .. )
 our @CFLAGS                 = ();
 our @CFLAGS_DEBUG           = ();
 our @CFLAGS_PROD            = ();
 our @CLINTFLAGS             = ();
     $ScmSourceTypes{ ".awk" }   = "--Ignore";
 #.. Get the stuff from the build configuration file
+#
     ConfigLoad();
+    $ScmMakeUid = GetMakfilefileUid();
+    Debug("ScmMakeUid: $ScmMakeUid");
     if ( (%::ScmBuildPlatforms) )        # Interface/build.cfg
+    {
         AddPlatformArg( split( /$;/, $::ScmBuildPlatforms{ $ScmPlatform } ));
+    }
 #                                     Options are:
 #                                       --Auto              - Non interactive unit test
 #                                       --Unit              - Same and --Auto
 #                                       --UtfFormat=nnn     - Specifies Automated Unit Test,
 #                                                             results post processed with formatter
+#                                       --UtfArg=nnn        - Argument passed into the UTF formatter
+#                                       --Name=nnn          - Test Name.
 #                                       --CopyIn=file       - A file to be copied into
 #                                                             The test directory.
+#
 #                                     Non Options are passed to the test program.
 #                                     --PackageBase(xxx)    - Base of package
 #                                       --FrameWork=name    - Name of framework
 #                                       --xxxx              - Args passed to framework constructor
+#
 # Returns         : Nothing
+#
+my %RunTestNames;                       # Unique Name Tests
 sub RunTest
+{
     my( $platforms, $prog, @elements ) = @_;
     my $command = './';                 # program prefix / command
     my $winprog = 1;                    # 1: Convert / -> \ (WIN32 only)
     my $framework;
     my @framework_opts;
     my @copy = ();
     my $auto;
     my $utfFormat;
+    my @utfArgs;
+    my $utfName;
     return if ( ! ActivePlatform($platforms) );
+    #
     #   Scan @elements and extract useful information
             $framework = $1;
         } elsif ( m/^--Auto/ || m/^--Unit/) {
             $auto = 1;
+        } elsif ( m/^--Name=(.*)/) {
+            $utfName = $1;
+            Error("Duplicate Test Name: $utfName")
+                if (exists $RunTestNames{$utfName} );
+            $RunTestNames{$utfName} = 1;
         } elsif ( m/^--UtfFormat=(.*)/) {
             $utfFormat = $1;
+        } elsif ( m/^--UtfArg=(.*)/) {
+            push @utfArgs, $1;
         } elsif ( m/^--CopyIn=(.*)/ ) {
             push @copy, MakeSrcResolve ( $1 );
         } elsif ( $framework && m/^--\w+=(.+)/ ) {
     $test_entry{'prog'}     = $prog;
     $test_entry{'copyprog'} = 1;
     $test_entry{'args'}     = \@uargs;
     $test_entry{'auto'}     = $auto if ( $auto );
     $test_entry{'utfformat'}= $utfFormat if ( $utfFormat );
+    $test_entry{'utfargs'}  = \@utfArgs;
+    $test_entry{'utfname'}  = $utfName;
     $test_entry{'copyin'}   = \@copy;
     $test_entry{'copyonce'} = ();
     $test_entry{'preq'}     = \@preq_files;
     $test_entry{'testdir'}  = 'BINDIR';
     if ( $ScmProduct ne "" );
 MakePrint( "GBE_OS_COMMON := $::BUILDINFO{$ScmPlatform}{OS_COMMON}\n" )
     if ( exists($::BUILDINFO{$ScmPlatform}{OS_COMMON}) );
     print MAKEFILE <<EOF;
 SHELL           := \$(GBE_BIN)/sh
 SHELLARGS       :=
 EXTENDED_LINE   := \$(GBE_BIN)/extend.lst
 BUILDVER         := $::ScmBuildVersionFull
 BUILDVERNUM      := $::ScmBuildVersion
 BUILDPREVIOUSVER := $::ScmBuildPreviousVersion
 DEPLOYPATCH      := $ScmDeploymentPatch
 GBE_NOTOOLSTEST  := $ScmNoToolsTest
+MAKEFILEUID      := $ScmMakeUid
+export MAKEFILEUID
+#
 #   Ensure PWD is correctly set
+#
 PWD             := \$(CURDIR)
     foreach my $pEntry ( @TESTS_TO_RUN )
     {                                           # Foreach test
         $idx++;
         $pEntry->{'index'} = $idx;
         $pEntry->{'test_name'} = "run_test_$idx";
+        $pEntry->{'utfname'} = $pEntry->{'test_name'} unless defined $pEntry->{'utfname'};
+        #
         #   If the test is being run within a 'FrameWork' then the underlying
         #   toolset must instantiate the frame work.
+        #
         push @TESTPROJECT_TO_ARUN, $test_name if     ($pEntry->{'auto'} );
         my $tprog = $tdir . '/' . StripDir( $pEntry->{'prog'} );
         my $me = MakeEntry::New( *MAKEFILE, $test_name, '--Phony' );
+        #
+        #   Export GBE_UTFNAME for the duration of the test
+        #
+        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
+        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
         $me->AddDependancy( "\$(GBE_$tdir_alias)" );
         $me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );
         $me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};
         $me->AddDependancy( @{ $pEntry->{'copyin' } } );
         $me->AddDependancy( map { $tdir . '/' . StripDir($_) } @{ $pEntry->{'copyonce' } } );
+        #
         #   Insert any FrameWork Recipe bits
+        #
         $me->AddShellRecipe ( @{$pEntry->{'ShellRecipe'}} );
+        #
+        #   Insert command
+        #       If we could run a UTF filter, then ignore the commands return code
+        #
         $me->AddShellRecipe ( "cd $tdir" );
         $me->AddShellRecipe ( ["GBE_TYPE=\$(GBE_TYPE)",
                                "GBE_HOST=\$(GBE_HOST)",
                                "GBE_ROOT=\$(GBE_ROOT_ABS)",
                                "PATH=.\\$::ScmPathSep\$(BINDIR_LOCAL_PATH)\\$::ScmPathSep\$\$PATH",
                                $pEntry->{'command'},
                                @{$pEntry->{'args'}},
+                               $pEntry->{'utfformat' } ? '|| true' : ''
                                ] );
         if ($pEntry->{'utfformat' })
+        {
+            #
+            #   Create the basic command line for 'jats_runutf'
+            #
+            my @cmdline;
+            push @cmdline, '--';
+            push @cmdline, '$(VERBOSE_OPT)';
+            push @cmdline, "-filter=$pEntry->{utfformat}";
+            push @cmdline, '-root=$(GBE_ROOT_ABS)' ;
+            push @cmdline, "-dir=$tdir";
+            push @cmdline, '-target=$(GBE_PLATFORM)';
+            push @cmdline, '-pkgdir=$(PKGDIR)';
+            push @cmdline, '-local=$(LOCALDIR)';
+            push @cmdline, '-interface=$(INTERFACEDIR)';
+            foreach my $entry (@{$pEntry->{'utfargs' }})
+            {
+                push @cmdline, '-arg=' . $entry;
+            }
+            #
             #   Insert commands to post process the test results according to the specified formatter
+            #
             $me->NewSection     ();
+            $me->SectionDef     ('UTF_POSTPROCESS');
             $me->RecipePrefix   ('$(XX_PRE)');
-            $me->AddShellRecipe ( "if [ -n \"\${GBE_ABT}\" ] ; then :" );
-            $me->AddShellRecipe ( "echo --------------------------------------" );
-            $me->AddShellRecipe ( "echo UTF stuff goes here:" . $pEntry->{'utfformat' } );
+            $me->AddRecipe      ( "\$(GBE_PERL) -Mjats_runutf -e processUtf " . join(" \\\n\t\t\t", @cmdline)  );
-            $me->AddShellRecipe ( "echo --------------------------------------" );
-            $me->AddShellRecipe ( "fi" );
+        }
         $me->Print();

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/makelib.pl2 – Rev 4778 → 4781