test65 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb249a06581fa2e69553600dc88ec52b620db6d5
-  data.tar.gz: cdbc6072308051d64c07c61e0c9d07ded8319b2e
+  metadata.gz: ce0b53ee6e1abb5f043427d993e103352f195fc2
+  data.tar.gz: 8f4cb1e01eb2f3fd19d5d05f1393b744a8547b63
 SHA512:
-  metadata.gz: cca5d442da99eb33a2fcc40f40029e4981e03fddeb037cb7b1e8b5123235b2725e0bc40a4e9927e9bb394827535048b9e5ad7d93ad360e25f99cfba2517ddc59
-  data.tar.gz: fdb97d5bbe8f9c7671904ab4591749740e2860d544416a04e269d13a5caac869da6c3173997d7b756b2db21b6ec0ff2ccd8cfed7fd75a7834b164514e2c5fd01
+  metadata.gz: 4863b308d617644627b0727380de7c6d7a5527ad37fdb317065a358b11289d215f5296eba4e10b6da9a2b82a5e533e898eb3438a4ff0441c7e228822e8d19404
+  data.tar.gz: 10fad1c205776264cd83ba4d99ba654f79e6efd7bae25d389dbd233f2284b770ae2e920351082c54d385b792c1ca8ff1c3257f07a285be2bd20c7c77486f785a

data/.gitignore

@@ -1,5 +1,6 @@
 *.out
 *.o
 *.lst
+*.s
 pkg
 foo

data/help.txt

@@ -1,4 +1,4 @@
-test65 - Run tests of 65c02 assembler code.
+test65 - Run tests of 65C02 C and assembler code.
 
 Usage: test65 {options} {files}
 
@@ -19,6 +19,6 @@ Notes:
 - By default, test files are located in a folder called "t65" in the current
   folder or one of its parent folders.
 - Wildcards are allowed for files but not the path.
-- If no files are specified, then all files matching "t65*.a65" or "t65*.rb"
-  in the test folder are tested.
+- If no files are specified, then all files matching "t65*.c65", "t65*.a65",
+  "t65*.c", "t65*.asm", or "t65*.rb" in the test folder are tested.
 - If files are specified, only the specified file(s) are tested.

data/lib/test65/build_file_list.rb

@@ -15,6 +15,9 @@ module Test65
   # Scan the path for files to be processed.
   def self.scan_files
     @test_files = Dir.glob(@options[:path] + "/t65*.a65") +
+                  Dir.glob(@options[:path] + "/t65*.asm") +
+                  Dir.glob(@options[:path] + "/t65*.c65") +
+                  Dir.glob(@options[:path] + "/t65*.c") +
                   Dir.glob(@options[:path] + "/t65*.rb")
     fail "Cannot locate any test files" if @test_files.empty?
   end

data/lib/test65/enclosures/ca65.rb

@@ -3,28 +3,27 @@ class TestScript
 
   # Setup ca65
   def ca65_initialize
-    @options[:target] = "sim65c02"
-    @options[:ca65_paths] = ["#{@options[:gem_root]}/asminc"]
-    @options[:objs] = []
+    @options[:ca65_target] = "sim65c02"
+    @options[:ca65_inc_paths] = ["#{@options[:gem_root]}/asminc"]
   end
 
   # Add some include paths for the assembler.
   def ca65_inc_paths(*more_paths)
     fail "Sequence error: ca65_inc_paths" unless @phase == :create
-    append_option(:inc_paths, more_paths)
+    append_option(:ca65_inc_paths, more_paths)
   end
 
   # Assemble some files.
   def ca65(file, options="")
     fail "Sequence error: ca65" unless @phase == :create
     source  = File.absolute_path(@options[:path] + "/" + file)
-    target  = "--target #{@options[:target]} "
-    paths   = build_args("-I", @options[:ca65_paths])
+    target  = "--target #{@options[:ca65_target]} "
+    paths   = build_args("-I", @options[:ca65_inc_paths])
 
-    # Convert source assemble files into object files.
+    # Convert source assembler files into object files.
     object = change_type(source, ".o")
     list   = @options[:list] ? "-l " + change_type(source, ".lst") : ""
-    command = "ca65 #{target}#{paths}#{list}#{options} -o #{object} #{source} #{@quiet}\n"
+    command = "ca65 #{target}#{paths}#{list} #{options} -o #{object} #{source} #{@quiet}\n"
     puts command if @options[:debug]
     system(command)
     fail "Error assembling #{source.localize_path}" unless $?.exitstatus == 0

data/lib/test65/enclosures/cc65.rb

@@ -0,0 +1,43 @@
+# An enclosure for the cc65 compiler.
+class TestScript
+
+  # Setup cc65
+  def cc65_initialize
+    @options[:cc65_target] = "sim65c02"
+    @options[:cc65_inc_paths] = ["#{@options[:gem_root]}/include"]
+  end
+
+  # Add some include paths for the compiler.
+  def cc65_inc_paths(*more_paths)
+    fail "Sequence error: cc65_inc_paths" unless @phase == :create
+    append_option(:cc65_inc_paths, more_paths)
+  end
+
+  # Compile some files.
+  def cc65(file, options="")
+    fail "Sequence error: cc65" unless @phase == :create
+    source = File.absolute_path(@options[:path] + "/" + file)
+    target = "--target #{@options[:cc65_target]} "
+    paths = build_args("--include-dir", @options[:cc65_inc_paths])
+
+    # Convert source C files into assembler files.
+    list = @options[:list] ? "--add-source " : " "
+    command = "cc65 #{target}#{list}#{paths}#{options} #{source} #{@quiet}\n"
+    puts command if @options[:debug]
+    system(command)
+    fail "Error compiling #{source.localize_path}" unless $?.exitstatus == 0
+
+    # Convert intermediate assembler files into object files.
+    temp = change_type(source, ".s")
+    object = change_type(source, ".o")
+    list   = @options[:list] ? "-l " + change_type(source, ".lst") : ""
+    command = "ca65 #{target}#{list} -o #{object} #{temp} #{@quiet}\n"
+    puts command if @options[:debug]
+    system(command)
+    fail "Error assembling #{source.localize_path}" unless $?.exitstatus == 0
+
+    @options[:temps] << temp
+    @options[:objs] << object
+  end
+
+end

data/lib/test65/perform_test.rb

@@ -1,6 +1,7 @@
 # Run a test script for the test65 program.
 
 require_relative 'enclosures/utils'
+require_relative 'enclosures/cc65'
 require_relative 'enclosures/ca65'
 require_relative 'enclosures/ld65'
 require_relative 'enclosures/sim65'
@@ -12,6 +13,10 @@ class TestScript
     @options = options.full_dup
     @phase   = :create
 
+    @options[:objs] = []
+    @options[:temps] = []
+
+    cc65_initialize
     ca65_initialize
     ld65_initialize
     sim65_initialize
@@ -25,6 +30,10 @@ class TestScript
     unless @options[:keep]
       File.delete(@output) if File.exists?(@output)
 
+      @options[:temps].each do |file|
+        File.delete(file) if File.exists?(file)
+      end
+
       @options[:objs].each do |file|
         File.delete(file) if File.exists?(file)
       end

data/lib/test65/process_files.rb

@@ -21,8 +21,11 @@ module Test65
   def self.process_file(file)
     puts file.localize_path if @options[:verbose]
 
-    case File.extname(file)
-    when ".a65"
+    case File.extname(file).downcase
+    when ".c65", ".c"
+      script { cc65(File.basename(file)); ld65; sim65 }
+
+    when ".a65", ".asm"
       script { ca65(File.basename(file)); ld65; sim65 }
 
     when ".rb"

data/lib/test65/version.rb

@@ -1,5 +1,5 @@
 module Test65
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 
   DESCRIPTION = "test65: A testing framework for ca65.".freeze
 end

data/t65/c_err.c65

@@ -0,0 +1,8 @@
+// Minimum test in "C" that passes.
+
+#include <stdlib.h>
+
+int main(void)
+{
+    exit_stage_left(0);
+}

data/t65/min_fail2.rb

@@ -0,0 +1,9 @@
+# Minimum script to pass a test.
+
+Test65.script do
+
+  ca65 "min_fail.a65"
+  ld65
+  sim65
+
+end

data/t65/min_fail2_c.rb

@@ -0,0 +1,9 @@
+# Minimum script to pass a test in C.
+
+Test65.script do
+
+  cc65 "min_fail_c.c65"
+  ld65
+  sim65
+
+end

data/t65/min_fail_c.c65

@@ -0,0 +1,8 @@
+// Minimum test in "C" that fails.
+
+#include <stdlib.h>
+
+int main(void)
+{
+    exit(255);
+}

data/t65/min_pass2_c.rb

@@ -0,0 +1,9 @@
+# Minimum script to pass a test in C.
+
+Test65.script do
+
+  cc65 "min_pass_c.c65"
+  ld65
+  sim65
+
+end

data/t65/min_pass3.asm

@@ -0,0 +1,12 @@
+; Minimum code that passes a test
+
+.import exit:absolute
+.export _main
+
+.pc02
+
+.code
+
+_main:
+  lda #0
+  jmp exit

data/t65/min_pass3_c.c

@@ -0,0 +1,8 @@
+// Minimum test in "C" that passes.
+
+#include <stdlib.h>
+
+int main(void)
+{
+    exit(0);
+}

data/t65/min_pass_c.c65

@@ -0,0 +1,8 @@
+// Minimum test in "C" that passes.
+
+#include <stdlib.h>
+
+int main(void)
+{
+    exit(0);
+}

data/t65/t65_pass2_c.c

@@ -0,0 +1,8 @@
+// Minimum test in "C" that passes.
+
+#include <stdlib.h>
+
+int main(void)
+{
+    exit(0);
+}

data/t65/t65_pass_c.c65

@@ -0,0 +1,8 @@
+// Minimum test in "C" that passes.
+
+#include <stdlib.h>
+
+int main(void)
+{
+    exit(0);
+}

data/t65/t65_test2_cfg.asm

@@ -0,0 +1,13 @@
+; Minimum code that passes a test
+
+.include "test65.i65"
+.export _main
+.pc02
+
+.zeropage
+mem1: .res 32
+
+.code
+
+_main:
+  tests_pass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test65
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - PeterCamilleri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: full_dup
@@ -86,6 +86,7 @@ files:
 - lib/test65.rb
 - lib/test65/build_file_list.rb
 - lib/test65/enclosures/ca65.rb
+- lib/test65/enclosures/cc65.rb
 - lib/test65/enclosures/ld65.rb
 - lib/test65/enclosures/sim65.rb
 - lib/test65/enclosures/utils.rb
@@ -98,6 +99,7 @@ files:
 - lib/test65/version.rb
 - rakefile.rb
 - t65/asm_err.a65
+- t65/c_err.c65
 - t65/callee.a65
 - t65/caller.a65
 - t65/foo.txt
@@ -105,10 +107,20 @@ files:
 - t65/macro_err1.a65
 - t65/macro_err2.a65
 - t65/min_fail.a65
+- t65/min_fail2.rb
+- t65/min_fail2_c.rb
+- t65/min_fail_c.c65
 - t65/min_pass.a65
-- t65/min_pass.rb
+- t65/min_pass2.rb
+- t65/min_pass2_c.rb
+- t65/min_pass3.asm
+- t65/min_pass3_c.c
+- t65/min_pass_c.c65
 - t65/pass.a65
 - t65/t65_min_pass.rb
+- t65/t65_pass2_c.c
+- t65/t65_pass_c.c65
+- t65/t65_test2_cfg.asm
 - t65/t65_test_cfg.a65
 - t65/t65_test_macros.a65
 - t65/t65_two_files.rb