Remove fullspec/standard sub-folder (PiSCSI#1324)

* Remove fullspec/standard sub-folder
hixhix · May 1, 2024 · 6a1e0f8 · 6a1e0f8
1 parent a516544
commit 6a1e0f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -35,7 +35,7 @@ jobs:
         run: make -j $(nproc) test
 
       - name: Run unit tests
-        run: (set -o pipefail && bin/fullspec/piscsi_test | tee piscsi_test_log.txt)
+        run: (set -o pipefail && bin/piscsi_test | tee piscsi_test_log.txt)
 
       - name: Upload logs
         uses: actions/upload-artifact@v3

diff --git a/cpp/Makefile b/cpp/Makefile
@@ -60,8 +60,8 @@ COVERAGE_DIR = coverage
 COVERAGE_FILE = piscsi.dat
 OS_FILES = ../os_integration
 
-OBJDIR := obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
-BINDIR := bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
+OBJDIR := obj
+BINDIR := bin
 
 BIN_ALL = \
 	$(BINDIR)/$(PISCSI) \