[svn:parrot] r48562 - in trunk: . config/gen/makefiles t/pmc t/pmc/testlib

[NotFound at svn.parrot.org]

Author: NotFound
Date: Wed Aug 18 13:09:42 2010
New Revision: 48562
URL: https://trac.parrot.org/parrot/changeset/48562

Log:
generate a pbc file for packfileannotations test, TT #1712

Added:
   trunk/t/pmc/testlib/annotations.pir   (contents, props changed)
Modified:
   trunk/MANIFEST
   trunk/config/gen/makefiles/root.in
   trunk/t/pmc/packfileannotations.t
   trunk/t/pmc/testlib/number.pasm   (contents, props changed)

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	Wed Aug 18 06:14:20 2010	(r48561)
+++ trunk/MANIFEST	Wed Aug 18 13:09:42 2010	(r48562)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Tue Aug 17 22:41:28 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Aug 18 12:54:57 2010 UT
 #
 # See below for documentation on the format of this file.
 #
@@ -1946,6 +1946,7 @@
 t/pmc/sub.t                                                 [test]
 t/pmc/sys.t                                                 [test]
 t/pmc/task.t                                                [test]
+t/pmc/testlib/annotations.pir                               [test]
 t/pmc/testlib/number.pasm                                   [test]
 t/pmc/testlib/packfile_common.pir                           [test]
 t/pmc/threads.t                                             [test]

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Wed Aug 18 06:14:20 2010	(r48561)
+++ trunk/config/gen/makefiles/root.in	Wed Aug 18 13:09:42 2010	(r48562)
@@ -1668,6 +1668,7 @@
     t/configure/*.t \
     t/steps/*.t
 PBC_TEST_FILES = \
+    t/pmc/testlib/annotations.pbc \
     t/pmc/testlib/number.pbc
 
 # pbc files used for several tests
@@ -1676,6 +1677,9 @@
 t/pmc/testlib/number.pbc: t/pmc/testlib/number.pasm
 	$(PARROT) -o t/pmc/testlib/number.pbc t/pmc/testlib/number.pasm
 
+t/pmc/testlib/annotations.pbc: t/pmc/testlib/annotations.pir
+	$(PARROT) -o t/pmc/testlib/annotations.pbc t/pmc/testlib/annotations.pir
+
 # Common prep for all test targets.
 # We probably need a complete build before running the tests.
 test_prep : all pbctestfiles

Modified: trunk/t/pmc/packfileannotations.t
==============================================================================
--- trunk/t/pmc/packfileannotations.t	Wed Aug 18 06:14:20 2010	(r48561)
+++ trunk/t/pmc/packfileannotations.t	Wed Aug 18 13:09:42 2010	(r48562)
@@ -19,6 +19,9 @@
 
 .include 't/pmc/testlib/packfile_common.pir'
 
+.const string annofilename = 't/pmc/testlib/annotations.pbc'
+
+
 .sub 'main' :main
 .include 'test_more.pir'
     plan(17)
@@ -42,7 +45,7 @@
 
     push_eh load_error
     $P0 = new ['FileHandle']
-    $P0.'open'('t/native_pbc/annotations.pbc', 'r')
+    $P0.'open'(annofilename, 'r')
     $P0.'encoding'('binary')
     $S0 = $P0.'readall'()
     pf = new 'Packfile'

Added: trunk/t/pmc/testlib/annotations.pir
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/t/pmc/testlib/annotations.pir	Wed Aug 18 13:09:42 2010	(r48562)
@@ -0,0 +1,20 @@
+# Copyright (C) 2009-2010, Parrot Foundation.
+# $Id$
+
+# This file is used from Packfile PMCs tests
+
+.sub 'main'
+.annotate "file", "annotations.pir"
+.annotate "creator", "Parrot Foundation"
+.annotate "line", 1
+    say "Hi"
+    say "line"
+.annotate "line", 2
+    .return ()
+.end
+
+# Local Variables:
+#   mode: pir
+#   fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4 ft=pir:

Modified: trunk/t/pmc/testlib/number.pasm
==============================================================================
--- trunk/t/pmc/testlib/number.pasm	Wed Aug 18 06:14:20 2010	(r48561)
+++ trunk/t/pmc/testlib/number.pasm	Wed Aug 18 13:09:42 2010	(r48562)
@@ -1,5 +1,6 @@
 # Copyright (C) 2009-2010, Parrot Foundation.
-# $Id:  $
+# $Id$
+
 # This file is used from Packfile PMCs tests
 
         set     N0, 1.0