diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 919613b..a401995 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,5 @@ -add_executable(test_env test_env.asm test_renderer.c test_env_expected.raw) -add_custom_command( - TARGET test_env POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/tests/test_env_expected.raw - ${CMAKE_CURRENT_BINARY_DIR}/test_env_expected.raw) -add_test(test_env test_env) \ No newline at end of file +add_executable(test_envelope test_envelope.asm test_renderer.c) +add_test(test_envelope test_envelope) + +file(GLOB RAW_FILES "${CMAKE_SOURCE_DIR}/tests/*.raw") +file(COPY ${RAW_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file diff --git a/tests/test_env_expected.raw b/tests/test_env_expected.raw deleted file mode 100644 index 105929a..0000000 Binary files a/tests/test_env_expected.raw and /dev/null differ diff --git a/tests/test_env.asm b/tests/test_envelope.asm similarity index 99% rename from tests/test_env.asm rename to tests/test_envelope.asm index 71ab3ba..9f6d794 100644 --- a/tests/test_env.asm +++ b/tests/test_envelope.asm @@ -597,7 +597,7 @@ section .data go4k_synth_instructions GO4K_BEGIN_CMDDEF(Instrument0) db GO4K_ENV_ID - db GO4K_PAN_ID + db GO4K_ENV_ID db GO4K_OUT_ID GO4K_END_CMDDEF ;// global commands @@ -617,7 +617,7 @@ section .data go4k_synth_parameter_values GO4K_BEGIN_PARAMDEF(Instrument0) GO4K_ENV ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) - GO4K_PAN PANNING(64) + GO4K_ENV ATTAC(95),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) GO4K_OUT GAIN(128), AUXSEND(0) GO4K_END_PARAMDEF ;// global parameters @@ -643,10 +643,9 @@ _go4k_delay_times section .data global _test_name -_test_name db 'test_env', 0 ; null terminated string +_test_name db 'test_envelope', 0 ; null terminated string global _test_max_samples -_test_max_samples - dd MAX_SAMPLES +_test_max_samples dd MAX_SAMPLES %include "../src/4klang.inc" diff --git a/tests/test_envelope_expected.raw b/tests/test_envelope_expected.raw new file mode 100644 index 0000000..59c0e67 Binary files /dev/null and b/tests/test_envelope_expected.raw differ