X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/e664a9f3949ead6acd19b69fce14dfa71e045abc..061e654cba197b09f58c6297e7d76d4527742885:/IR-Data/test-suite.sh

diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh
index 1808f09..3ea37ca 100644
--- a/IR-Data/test-suite.sh
+++ b/IR-Data/test-suite.sh
@@ -51,6 +51,7 @@ for j in                            \
     elta_radio.txt                  \
     fdc.txt                         \
     jvc.txt                         \
+    jvc-rm-rk250-10kHz.txt          \
     nec-repetition.txt              \
     nec-skymaster-dt500.txt         \
     nec.txt                         \
@@ -85,9 +86,10 @@ do
 done
 
 # t-home-mediareceiver-15kHz.txt (RUWIDO) conflicts with Denon
+# a1tvbox-15kHz.txt (A1TVBOX) conflicts with MERLIN
+# Siemens-Gigaset-M740AV-15kHz.txt (SIEMENS) conflicts with MERLIN
 
 for j in                                \
-    a1tvbox-15kHz.txt                   \
     bo_beolink1000-15kHz.txt            \
     bose_wave_system_15khz.txt          \
     denon-15kHz.txt                     \
@@ -95,11 +97,13 @@ for j in                                \
     denon-rc-176-repeat-15kHz.txt       \
     irc-15kHz.txt                       \
     kathrein-15kHz.txt                  \
+    lg-air-15kHz.txt                    \
+    merlin-15kHz.txt                    \
     recs80-15kHz.txt                    \
     saa3004-15kHz.txt                   \
     samsung32-15kHz.txt                 \
+    samsung48-15kHz.txt                 \
     sharp_15khz.txt                     \
-    Siemens-Gigaset-M740AV-15kHz.txt    \
     thomson-mb100-15kHz.txt             \
     tp400vt-15kHz.txt                   \
     universal-15kHz.txt                 \
@@ -121,12 +125,15 @@ do
     fi
 done
 
+# a1tvbox-15kHz.txt (A1TVBOX) conflicts with MERLIN
+
 for j in                                \
-    a1tvbox-20kHz.txt                   \
     rc-car-20kHz.txt                    \
     fdc-20kHz.txt                       \
     fdc2-20kHz.txt                      \
-    saa3004-20kHz.txt
+    rcmm-20kHz.txt                      \
+    saa3004-20kHz.txt                   \
+    telefunken-1560-20kHz.txt
 do
     echo -n "testing $j ... "
     if tmpsrc/irmp-20kHz -v < $j | grep -q error