[svn:parrot] r39101 - in branches/test_install/t/tools/install: . testlib testlib/include/parrot

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Sat May 23 18:16:31 2009
New Revision: 39101
URL: https://trac.parrot.org/parrot/changeset/39101

Log:
Add one more type of file to those tested.  Further refactoring of %testfiles.

Added:
   branches/test_install/t/tools/install/testlib/include/parrot/charset.h
      - copied unchanged from r39096, branches/test_install/t/tools/install/testlib/LICENSE
Modified:
   branches/test_install/t/tools/install/overall.t
   branches/test_install/t/tools/install/testlib/manifest_pseudo

Modified: branches/test_install/t/tools/install/overall.t
==============================================================================
--- branches/test_install/t/tools/install/overall.t	Sat May 23 18:04:22 2009	(r39100)
+++ branches/test_install/t/tools/install/overall.t	Sat May 23 18:16:31 2009	(r39101)
@@ -38,6 +38,7 @@
         print STDERR "$builddir\n$prefixdir\n";
     }
 
+    my $includedir = File::Spec->catdir( $prefixdir, 'include' );
     my $docdir = File::Spec->catdir( $prefixdir, 'share', 'doc' );
     my $versiondir = $PConfig{versiondir};
 
@@ -45,12 +46,17 @@
         'LICENSE'                 => {
             start   => File::Spec->catfile( qw| . LICENSE | ),
             end     => File::Spec->catfile(
-                        'share', 'doc', $versiondir, 'LICENSE' )
+                        $docdir, $versiondir, 'LICENSE' )
         },
         'docs/gettingstarted.pod' => {
             start   => File::Spec->catfile( qw| . docs gettingstarted.pod | ),
             end     => File::Spec->catfile(
-                        'share', 'doc', $versiondir, 'pod', 'gettingstarted.pod' ),
+                        $docdir,  $versiondir, 'pod', 'gettingstarted.pod' ),
+        },
+        'include/parrot/charset.h' => {
+            start   => File::Spec->catfile( qw| . include parrot charset.h | ),
+            end     => File::Spec->catfile(
+                        $includedir, $versiondir, 'parrot', 'charset.h' ),
         },
     );
     chdir $builddir or croak "Unable to change to tempdir for testing: $!";
@@ -64,15 +70,18 @@
     my @dirs_needed = qw(
         src
         docs
+        include/parrot
     );
     my @created =
         mkpath( map { File::Spec->catdir( $builddir, $_ ) } @dirs_needed );
+    print STDERR "dirs created:  @created\n" if $DEBUG;
     foreach my $f ( keys %testfiles ) {
         my $src = File::Spec->catfile( $cwd, $testlibdir, $f );
         my $des = File::Spec->catfile( $builddir, $testfiles{$f}{start} );
         copy $src, $des or croak "Unable to copy $f for testing: $!";
     }
     my $cmd = qq{$^X $full_installer --prefix=$prefixdir};
+    $cmd .= qq{ --includedir=$includedir};
     $cmd .= qq{ --versiondir=$versiondir};
     $cmd .= qq{ --docdir=$docdir};
     $cmd .= qq{ MANIFEST MANIFEST.generated};
@@ -87,8 +96,7 @@
     like( $stdout, qr/^Installing/, "Got expected standard output" );
     my $seen = 0;
     foreach my $f ( keys %testfiles ) {
-        my $des =
-            File::Spec->catfile( $prefixdir, $testfiles{$f}{end} );
+        my $des = $testfiles{$f}{end};
         print STDERR "wanted:  $des\n" if $DEBUG;
         $seen++ if -f $des;
     }

Copied: branches/test_install/t/tools/install/testlib/include/parrot/charset.h (from r39096, branches/test_install/t/tools/install/testlib/LICENSE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/test_install/t/tools/install/testlib/include/parrot/charset.h	Sat May 23 18:16:31 2009	(r39101, copy of r39096, branches/test_install/t/tools/install/testlib/LICENSE)
@@ -0,0 +1,2 @@
+# $Id$
+

Modified: branches/test_install/t/tools/install/testlib/manifest_pseudo
==============================================================================
--- branches/test_install/t/tools/install/testlib/manifest_pseudo	Sat May 23 18:04:22 2009	(r39100)
+++ branches/test_install/t/tools/install/testlib/manifest_pseudo	Sat May 23 18:16:31 2009	(r39101)
@@ -8,6 +8,7 @@
 # has been told about new or deleted files.
 LICENSE                                                     [main]doc
 docs/gettingstarted.pod                                     [main]doc
+include/parrot/charset.h                                    [main]include
 # Local variables:
 #   mode: text
 # End: