Skip to content

Commit 4f62070

Browse files
committed
fix test
1 parent 4ed3876 commit 4f62070

File tree

3 files changed

+43
-9
lines changed

3 files changed

+43
-9
lines changed

Makefile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,10 @@ kernel: $(SOURCE)
7979
@$(AR) r tmp/kernel_bank8.lib tmp/xsend.o
8080
@$(AR) r tmp/kernel_bank8.lib tmp/xclose_socket.o
8181
@$(AR) r tmp/kernel_bank8.lib tmp/close_sockets_by_pid.o
82-
83-
8482
@$(AS) --cpu 6502 -DWITH_SDCARD_FOR_ROOT=1 --verbose -s -ttelestrat src/kernel_main_memory.s -o tmp/kernel_main_memory.ld65
85-
86-
echo ici
8783
@$(AS) --verbose -s --debug-info --cpu 6502 src/kernel8/src/kernel8.s -o tmp/kernel_bank8.ld65 $(ASFLAGS) > output.log
88-
echo ici2
8984
@$(AS) --verbose -s --debug-info -o tmp/kernel_bank0.ld65 -DWITH_SDCARD_FOR_ROOT=1 src/kernel_bank0.s $(ASFLAGS) > output.log
9085
@$(AS) --verbose -s --debug-info -o tmp/kernelsd.ld65 -DWITH_SDCARD_FOR_ROOT=1 $(SOURCE) $(ASFLAGS) > output.log
91-
92-
echo ici3
9386
@$(LD) -C cfg/kernel.cfg -DWITH_SDCARD_FOR_ROOT=1 tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib -Ln tmp/kernelsd.sym -m tmp/memmap.txt -vm
9487
@cp kernel.rom kernelsd.rom
9588

@@ -113,8 +106,11 @@ compile_cc65:
113106
@echo "########################################################"
114107
@echo "# Compile C file with cc65 #"
115108
@echo "########################################################"
116-
@echo "FILE_TO_COMPILE: $(FILE_TO_COMPILE) FINAL_BIN: $(FINAL_BIN) "
109+
@echo "FILE_TO_COMPILE: $(FILE_TO_COMPILE) FINAL_BIN: $(FINAL_BIN)"
110+
@mkdir tmp/
111+
@echo Build $(FILE_TO_COMPILE) to tmp/$(FINAL_BIN)_1000.s
117112
@$(CC) $(CFLAGS) $(FILE_TO_COMPILE) -o tmp/$(FINAL_BIN)_1000.s
113+
@echo Build $(FILE_TO_COMPILE) to tmp/$(FINAL_BIN)_2304.s
118114
@$(CC) $(CFLAGS) $(FILE_TO_COMPILE) -o tmp/$(FINAL_BIN)_2304.s
119115

120116
@$(AS) $(CFLAGS) tmp/$(FINAL_BIN)_1000.s -o tmp/$(FINAL_BIN)_1000.o

tests/docker/Dockerfile

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Utilise une image de base, par exemple Ubuntu
2+
FROM ubuntu:latest
3+
4+
# Installe Git
5+
RUN apt-get update && apt-get install -y git pip python3 python3.12-venv
6+
7+
# Clone un dépôt Git
8+
#COPY ../../ /kernel
9+
RUN git clone https://github.com/orix-software/kernel.git -b develop
10+
11+
# Définit le répertoire de travail
12+
WORKDIR /kernel
13+
14+
RUN git clone https://github.com/orix-software/bpm
15+
16+
RUN python3 -m venv /opt/venv
17+
ENV PATH="/opt/venv/bin:$PATH"
18+
#RUN python3 -m venv mon_env
19+
#RUN source mon_env/bin/activate
20+
RUN ls -l
21+
22+
RUN cd bpm && pip install -r requirements.txt && cd ..
23+
RUN mkdir ~/bin
24+
RUN cp bpm/src/bpm ~/bin
25+
RUN chmod 755 ~/bin/bpm
26+
ENV PATH=$PATH:~/bin
27+
# RUN echo $PATH
28+
RUN echo "#!/bin/bash\nbpm --force-update --replace-for-new-project" > initscript.sh
29+
#RUN echo "cd src/kernel8 && bpm update cd ../../" >> initscript.sh
30+
# Commande par défaut à exécuter lorsque le conteneur démarre
31+
32+
# Rendez le script exécutable
33+
RUN chmod +x initscript.sh
34+
# Exécutez le script au démarrage du conteneur
35+
#ENTRYPOINT ["/kernel/initscript.sh"]
36+
37+
CMD ["echo", "Le dépôt Git a été clonné avec succès."]

tests/unit_test/xrm.sub

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ exit
99

1010
:error_rm
1111
echo ^[A il y a un dysfonctionnement avec rm, le fichier n'a pas été supprimé
12-
exit
12+
goto egeneral
13+

0 commit comments

Comments
 (0)