Merge pull request boj-rs#60 from byeongkeunahn/fix-test

Fix test/bench

Author: kiwiyou

.cargo/config.toml

@@ -1,5 +1,5 @@
 [build]
-rustflags = ["-Z", "export-executable-symbols", "-C", "target-feature=+avx,+avx2,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+fma,+f16c,+aes", "-C", "relocation-model=pie", "-C", "target-cpu=haswell"]
+rustflags = ["-Z", "share-generics=no", "-Z", "export-executable-symbols", "-C", "target-feature=+avx,+avx2,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+fma,+f16c,+aes", "-C", "relocation-model=pie", "-C", "target-cpu=haswell"]
 
 [target.wasm32-unknown-unknown]
-rustflags = ["-C", "link-args=-z stack-size=67108864"]
+rustflags = ["-Z", "share-generics=no", "-C", "link-args=-z stack-size=67108864"]

.github/workflows/build-linux.yml

@@ -47,8 +47,6 @@ jobs:
       - name: Test
         if: ${{ matrix.target != 'wasm32-unknown-unknown' }}
         run: cargo test --lib -- --test-threads 1
-        env:
-          RUSTFLAGS: ""
       - name: Check C (x86_64)
         if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
         run: |

.github/workflows/build-windows.yml

@@ -48,8 +48,6 @@ jobs:
       - name: Test
         if: ${{ matrix.target != 'wasm32-unknown-unknown' }}
         run: cargo test --lib -- --test-threads 1
-        env:
-          RUSTFLAGS: ""
       - name: Check C (x86_64)
         if: ${{ matrix.target == 'x86_64-pc-windows-msvc' }}
         run: |

basm/Cargo.toml

@@ -5,6 +5,11 @@ edition = "2021"
 default-run = "basm"
 autobins = false
 
+[lib]
+test = true
+bench = true
+path = "src/bin/basm-lib.rs"
+
 [[bin]]
 name = "basm"
 test = false

basm/src/bin/basm-lib.rs

@@ -0,0 +1,28 @@
+#![feature(fn_align)]
+#![feature(maybe_uninit_uninit_array)]
+#![feature(maybe_uninit_slice)]
+#![feature(maybe_uninit_array_assume_init)]
+#![feature(naked_functions)]
+#![feature(alloc_error_handler)]
+#![cfg_attr(not(test), no_builtins)]
+#![cfg_attr(not(test), no_std)]
+#![cfg_attr(not(test), no_main)]
+extern crate alloc;
+
+extern crate basm_std as basm;
+
+#[allow(dead_code)]
+#[path = "../solution.rs"]
+mod solution;
+
+#[cfg(test)]
+mod verify_test_works {
+    fn add(x: i64, y: i64) -> i64 {
+        x + y
+    }
+
+    #[test]
+    fn run() {
+        assert_eq!(8, add(5, 3));
+    }
+}

basm/src/bin/basm-submit.rs

@@ -16,6 +16,7 @@ extern crate basm_std as basm;
 mod solution;
 mod codegen;
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_pi: &core::panic::PanicInfo) -> ! {
     unsafe { core::hint::unreachable_unchecked() }

basm/src/bin/basm.rs

@@ -16,6 +16,7 @@ extern crate basm_std as basm;
 mod solution;
 mod codegen;
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_pi: &core::panic::PanicInfo) -> ! {
     use alloc::string::ToString;