Merge branch 'test/spi_slave_psram_disable' into 'master'

test: disable the spi slave startup test when psram is enabled

See merge request idf/esp-idf!3373

components/driver/test/test_spi_slave.c

@@ -7,6 +7,7 @@
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
 #include "esp_log.h"
+#include "sdkconfig.h"
 
 #define PIN_NUM_MISO 25
 #define PIN_NUM_MOSI 23
@@ -74,6 +75,9 @@ static void slave_init()
     TEST_ESP_OK( spi_slave_initialize(VSPI_HOST, &buscfg, &slvcfg, 2) );
 }
 
+#ifndef CONFIG_SPIRAM_SUPPORT
+//This test should be removed once the timing test is merged.
+
 TEST_CASE("test slave startup","[spi]")
 {
     uint8_t master_txbuf[320]=MASTER_SEND;
@@ -139,3 +143,5 @@ TEST_CASE("test slave startup","[spi]")
 
     ESP_LOGI(MASTER_TAG, "test passed.");
 }
+
+#endif