Make host tests compile again

earlephilhower · Dec 31, 2019 · 1d6186b · 1d6186b
1 parent 074dfd4
commit 1d6186b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/tests/host/Arduino.h b/tests/host/Arduino.h
@@ -30,6 +30,12 @@ class SerialEmulator {
     void flush() {};
 };
 extern SerialEmulator Serial;
+
+class Print : public SerialEmulator {
+  public:
+    Print() {};
+    ~Print() {};
+};
 #endif
 
 #ifndef ICACHE_RODATA_ATTR

diff --git a/tests/host/Makefile b/tests/host/Makefile
@@ -31,23 +31,27 @@ libflac=../../src/libflac/md5.c ../../src/libflac/window.c ../../src/libflac/mem
 CCOPTS=-g -Wunused-parameter -Wall -m32 -include Arduino.h
 CPPOPTS=-g -Wunused-parameter -Wall -std=c++11 -m32 -include Arduino.h
 
+.phony: all
+
+all: mp3 aac wav
+
 mp3: FORCE
 	rm -f *.o
 	gcc $(CCOPTS) -c $(libmad) -I ../../src/ -I.
-	g++ $(CPPOPTS) -o mp3 mp3.cpp Serial.cpp *.o ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioFileSourceID3.cpp ../../src/AudioFileSourceBuffer.cpp ../../src/AudioGeneratorMP3.cpp ../../src/AudioOutputMixer.cpp -I ../../src/ -I.
+	g++ $(CPPOPTS) -o mp3 mp3.cpp Serial.cpp *.o ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioFileSourceID3.cpp ../../src/AudioFileSourceBuffer.cpp ../../src/AudioGeneratorMP3.cpp ../../src/AudioOutputMixer.cpp ../../src/AudioLogger.cpp  -I ../../src/ -I.
 	rm -f *.o
 	echo valgrind --leak-check=full --track-origins=yes -v --error-limit=no --show-leak-kinds=all ./mp3
 
 aac: FORCE
 	rm -f *.o
 	gcc $(CCOPTS) -DUSE_DEFAULT_STDLIB -c $(libhelix_aac) -I ../../src/ -I.
-	g++ $(CPPOPTS) -o aac aac.cpp Serial.cpp *.o ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioFileSourceID3.cpp ../../src/AudioGeneratorAAC.cpp -I ../../src/ -I.
+	g++ $(CPPOPTS) -o aac aac.cpp Serial.cpp *.o ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioFileSourceID3.cpp ../../src/AudioGeneratorAAC.cpp  ../../src/AudioLogger.cpp -I ../../src/ -I.
 	rm -f *.o
 	echo valgrind --leak-check=full --track-origins=yes -v --error-limit=no --show-leak-kinds=all ./aac
 
 wav: FORCE
 	rm -f *.o
-	g++ $(CPPOPTS) -o wav wav.cpp Serial.cpp  ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioGeneratorWAV.cpp  -I ../../src/ -I.
+	g++ $(CPPOPTS) -o wav wav.cpp Serial.cpp  ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioGeneratorWAV.cpp   ../../src/AudioLogger.cpp -I ../../src/ -I.
 	rm -f *.o
 	echo valgrind --leak-check=full --track-origins=yes -v --error-limit=no --show-leak-kinds=all ./wav
 

diff --git a/tests/host/mp3.cpp b/tests/host/mp3.cpp
@@ -6,6 +6,8 @@
 #include "AudioFileSourceBuffer.h"
 #include "AudioOutputMixer.h"
 
+#define MP3 "../../examples/PlayMP3FromSPIFFS/data/pno-cs.mp3"
+
 // Called when a metadata event occurs (i.e. an ID3 tag, an ICY block, etc.
 void MDCallback(void *cbData, const char *type, bool isUnicode, const char *string)
 {
@@ -45,7 +47,7 @@ int main(int argc, char **argv)
 {
     (void) argc;
     (void) argv;
-    AudioFileSourceSTDIO *in = new AudioFileSourceSTDIO("jamonit.mp3");
+    AudioFileSourceSTDIO *in = new AudioFileSourceSTDIO(MP3);
     AudioFileSourceBuffer *buff = new AudioFileSourceBuffer(in, 2048);
     buff->RegisterStatusCB(StatusCallback, (void*)"buffer");
     AudioFileSourceID3 *id3 = new AudioFileSourceID3(buff);