[svn:parrot] r47062 - trunk/t/compilers/opsc

[bacek at svn.parrot.org]

Author: bacek
Date: Thu May 27 21:23:04 2010
New Revision: 47062
URL: https://trac.parrot.org/parrot/changeset/47062

Log:
Fix opsc tests after ops_massacre merge.

Modified:
   trunk/t/compilers/opsc/06-opsfile.t
   trunk/t/compilers/opsc/07-emitter.t
   trunk/t/compilers/opsc/common.pir

Modified: trunk/t/compilers/opsc/06-opsfile.t
==============================================================================
--- trunk/t/compilers/opsc/06-opsfile.t	Thu May 27 21:12:15 2010	(r47061)
+++ trunk/t/compilers/opsc/06-opsfile.t	Thu May 27 21:23:04 2010	(r47062)
@@ -20,9 +20,9 @@
 # 116 math
 # We can generate more than 1 Ops::Op per op due args expansion.
 say( "# Parsed " ~ + at ops);
-# There is more than 300 ops in this 2 files.
+# There is more than 200 ops in this 2 files.
 # Feel free to update number if you change them.
-ok(+ at ops == 306, "Ops parsed correctly");
+ok(+ at ops == 264, "Ops parsed correctly");
 say('# ' ~ + at ops);
 
 my $op := @ops[0];
@@ -32,7 +32,7 @@
 ok($op<code> == 0,      "... with code 0");
 
 $op := @ops[(+ at ops)-1];
-ok($op.name eq 'tanh',  "Last op is tanh");
+ok($op.name eq 'sqrt',  "Last op is tanh");
 say('# ' ~ $op.name);
 ok($op<code> > 84 + 116,    "... with non zero code");
 

Modified: trunk/t/compilers/opsc/07-emitter.t
==============================================================================
--- trunk/t/compilers/opsc/07-emitter.t	Thu May 27 21:12:15 2010	(r47061)
+++ trunk/t/compilers/opsc/07-emitter.t	Thu May 27 21:23:04 2010	(r47062)
@@ -42,12 +42,13 @@
 
 $fh.close();
 my $header := $fh.readall();
+#say($header);
 
 ok($header ~~ /define \s PARROT_OPLIB_CORE_OPS_H_GUARD/, 'Guard generated');
 ok($header ~~ /endif/, 'Close guard generated');
 ok($header ~~ /DO \s NOT \s EDIT \s THIS \s FILE/, 'Preamble generated');
 ok($header ~~ /Parrot_DynOp_core_ \d+ _ \d+ _ \d+/, '... and contains init_func');
-ok($header ~~ /Parrot_sysinfo_s_i/, 'We have proper names of ops functions');
+ok($header ~~ /Parrot_err_s_ic/, 'We have proper names of ops functions');
 
 # Testing C emitting.
 #$emitter.print_c_source_file();

Modified: trunk/t/compilers/opsc/common.pir
==============================================================================
--- trunk/t/compilers/opsc/common.pir	Thu May 27 21:12:15 2010	(r47061)
+++ trunk/t/compilers/opsc/common.pir	Thu May 27 21:23:04 2010	(r47062)
@@ -6,6 +6,8 @@
 
 =cut
 
+.loadlib 'io_ops'
+
 .sub '_parse_buffer'
     .param string buffer