From 4cce8bd07a6a174403591a57c18afe392cad96f9 Mon Sep 17 00:00:00 2001 From: Colin Holzman Date: Thu, 25 Mar 2021 12:09:36 -0400 Subject: [PATCH] Moved code_generator_test. --- .../test/xyz/colinholzman/makina/CodeGeneratorTest.kt | 6 +++--- .../test => test}/code_generator_test/.gitignore | 0 {makina-compiler/test => test}/code_generator_test/makefile | 2 +- .../test => test}/code_generator_test/test_data.h | 0 .../test => test}/code_generator_test/test_driver.c | 0 .../test => test}/code_generator_test/test_source.mkna | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename {makina-compiler/test => test}/code_generator_test/.gitignore (100%) rename {makina-compiler/test => test}/code_generator_test/makefile (57%) rename {makina-compiler/test => test}/code_generator_test/test_data.h (100%) rename {makina-compiler/test => test}/code_generator_test/test_driver.c (100%) rename {makina-compiler/test => test}/code_generator_test/test_source.mkna (100%) diff --git a/makina-compiler/test/xyz/colinholzman/makina/CodeGeneratorTest.kt b/makina-compiler/test/xyz/colinholzman/makina/CodeGeneratorTest.kt index eb24687..344f357 100644 --- a/makina-compiler/test/xyz/colinholzman/makina/CodeGeneratorTest.kt +++ b/makina-compiler/test/xyz/colinholzman/makina/CodeGeneratorTest.kt @@ -34,16 +34,16 @@ internal class CodeGeneratorTest { @Test fun testCodeGenerator() { val makeClean = ProcessBuilder() - .directory(File("./test/code_generator_test")) + .directory(File("./../test/code_generator_test")) .command("make", "clean").start() makeClean.waitFor(10, TimeUnit.SECONDS) val make = ProcessBuilder() - .directory(File("./test/code_generator_test")) + .directory(File("./../test/code_generator_test")) .command("make").start() make.waitFor(10, TimeUnit.SECONDS) - File("./test/code_generator_test/out/test_output.txt").reader().use { + File("./../test/code_generator_test/out/test_output.txt").reader().use { assertEquals(testOutput, it.readLines()) } } diff --git a/makina-compiler/test/code_generator_test/.gitignore b/test/code_generator_test/.gitignore similarity index 100% rename from makina-compiler/test/code_generator_test/.gitignore rename to test/code_generator_test/.gitignore diff --git a/makina-compiler/test/code_generator_test/makefile b/test/code_generator_test/makefile similarity index 57% rename from makina-compiler/test/code_generator_test/makefile rename to test/code_generator_test/makefile index aa6cafc..5162194 100644 --- a/makina-compiler/test/code_generator_test/makefile +++ b/test/code_generator_test/makefile @@ -6,7 +6,7 @@ out/test: test_driver.c out/test.c out/test.h out gcc test_driver.c out/test.c -I "." -std=c99 -Wall -Wextra -Werror -o out/test out/test.c: - java -jar ../../out/artifacts/makina_compiler_jar/makina-compiler.jar test_source.mkna -m "struct machine_data" -e "struct event_data" -i "test_data.h" -o out + java -jar ../../makina-compiler/out/artifacts/makina_compiler_jar/makina-compiler.jar test_source.mkna -m "struct machine_data" -e "struct event_data" -i "test_data.h" -o out out: mkdir out diff --git a/makina-compiler/test/code_generator_test/test_data.h b/test/code_generator_test/test_data.h similarity index 100% rename from makina-compiler/test/code_generator_test/test_data.h rename to test/code_generator_test/test_data.h diff --git a/makina-compiler/test/code_generator_test/test_driver.c b/test/code_generator_test/test_driver.c similarity index 100% rename from makina-compiler/test/code_generator_test/test_driver.c rename to test/code_generator_test/test_driver.c diff --git a/makina-compiler/test/code_generator_test/test_source.mkna b/test/code_generator_test/test_source.mkna similarity index 100% rename from makina-compiler/test/code_generator_test/test_source.mkna rename to test/code_generator_test/test_source.mkna