mumuki-qsim-runner 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 079017d67d9727f4e5b9254b2a2e9650c2ea6ead
-  data.tar.gz: 250ad7275089849027cab37208a0b55ac4170f3a
+  metadata.gz: e328f5107c8be0e6be6afbfc57da5155a8bf9b94
+  data.tar.gz: 933c6c30132d17a78166df63bb672a3306944af3
 SHA512:
-  metadata.gz: 8dd8c9fb0278a5169b776014a559ccc0aff025afb8475177de8a74eb6438829473f896781a9ace9e47b9255ae557a1369ce9a82a0d1b727cc487057d07293831
-  data.tar.gz: c646587d123053b75251902e21496ed8e57a8283a7559fcae1813fc5199a0f125295c13a20037e2523cedde7c5f05ef33f358e9e1d90b316230481bc507684a9
+  metadata.gz: e1211643581f06df53885d4cc368da7b05e18524b3ad37766cb2cd0018bbae1d8aff01db35adc2771bdbe4e50a11565eb6f9aff50c29bb981c350202a86f4682
+  data.tar.gz: db5bcf5ed50f23e1ecb33b100be94c97c5ec6a2efa4ad1ed115bc682e6cdbcc63358c0448bf92076e54d59597299e9e1d61a1d49ae218d6c8d36a24f1178f763

data/lib/multiple_executions_runner.rb

@@ -0,0 +1,10 @@
+module Qsim
+  class MultipleExecutionsRunner
+    def run(output, example)
+      result = output.find { |it| it[:id] == example[:id] }
+
+      raise Mumukit::Metatest::Errored, result[:error] if result[:error]
+      result
+    end
+  end
+end

data/lib/qsim_runner.rb

@@ -13,4 +13,5 @@ end
 require_relative './test_hook'
 require_relative './metadata_hook'
 require_relative './checker'
+require_relative './multiple_executions_runner'
 require_relative './html_renderer'

data/lib/test_hook.rb

@@ -1,18 +1,28 @@
 class QsimTestHook < Mumukit::Templates::FileHook
+  include Mumukit::WithTempfile
   isolated true
-  mashup :extra, :content
 
   def tempfile_extension
     '.qsim'
   end
 
   def command_line(filename)
-    "runqsim #{filename} 6"
+    "runqsim #{filename} #{q_architecture} #{input_file_separator}"
   end
 
   def compile_file_content(request)
-    @examples = parse_test(request)[:examples]
-    (super request).strip
+    @examples = to_examples(parse_test(request)[:examples])
+
+    <<EOF
+CALL main
+
+#{request.extra}
+
+main:
+#{request.content}
+#{input_file_separator}
+#{initial_state_file}
+EOF
   end
 
   def execute!(request)
@@ -35,16 +45,61 @@ class QsimTestHook < Mumukit::Templates::FileHook
 
   private
 
+  def to_examples(examples)
+    defaults = { preconditions: {} }
+    examples.each_with_index.map { |example, index| defaults.merge(example).merge(id: index) }
+  end
+
   def framework
     Mumukit::Metatest::Framework.new checker: Qsim::Checker.new,
-                                     runner: Mumukit::Metatest::IdentityRunner.new
+                                     runner: Qsim::MultipleExecutionsRunner.new
   end
 
   def parse_json(json_result)
-    JSON.parse(json_result).deep_symbolize_keys
+    JSON.parse(json_result).map(&:deep_symbolize_keys)
   end
 
   def parse_test(request)
     YAML.load(request.test).deep_symbolize_keys
   end
+
+  def default_initial_state
+    {
+      special_records: {
+        PC: '0000',
+        SP: 'FFEF',
+        IR: '0000'
+      },
+      flags: {
+        N: 0,
+        Z: 0,
+        V: 0,
+        C: 0
+      },
+      records: {
+        R0: '0000',
+        R1: '0000',
+        R2: '0000',
+        R3: '0000',
+        R4: '0000',
+        R5: '0000',
+        R6: '0000',
+        R7: '0000'
+      },
+      memory: {}
+    }
+  end
+
+  def initial_state_file
+    initial_states = @examples.map { |example| default_initial_state.merge(id: example[:id]).merge(example[:preconditions]) }
+    JSON.generate initial_states
+  end
+
+  def input_file_separator
+    '!!!BEGIN_EXAMPLES!!!'
+  end
+
+  def q_architecture
+    6
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-qsim-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -106,6 +106,7 @@ files:
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/metadata_hook.rb
+- lib/multiple_executions_runner.rb
 - lib/qsim_runner.rb
 - lib/records.html.erb
 - lib/test_hook.rb