Merge branch 'bugfix/rtc_xtal_unit_test' into 'master'

igrr · igrr · commit 4667d9c804e0 · 2018-03-26T15:41:25.000+08:00
Fix 32k RTC XTAL unit test failures

See merge request idf/esp-idf!2124
diff --git a/components/soc/esp32/test/test_rtc_clk.c b/components/soc/esp32/test/test_rtc_clk.c
@@ -151,6 +151,9 @@ void stop_rtc_external_quartz(){
     gpio_output_set_high(0, 0, 0, mask_32 | mask_33); // disable pins
 }
 
+#ifdef CONFIG_SPIRAM_SUPPORT
+// PSRAM tests run on ESP-WROVER-KIT boards, which have the 32k XTAL installed.
+// Other tests may run on DevKitC boards, which don't have a 32k XTAL.
 TEST_CASE("Test starting external RTC quartz", "[rtc_clk]")
 {
     int i = 0, fail = 0;
@@ -182,3 +185,4 @@ TEST_CASE("Test starting external RTC quartz", "[rtc_clk]")
         printf("Test passed successfully\n");
     }
 }
+#endif // CONFIG_SPIRAM_SUPPORT

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,9 @@ void stop_rtc_external_quartz(){`
`151`	`151`	`gpio_output_set_high(0, 0, 0, mask_32 \| mask_33); // disable pins`
`152`	`152`	`}`
`153`	`153`
	`154`	`+#ifdef CONFIG_SPIRAM_SUPPORT`
	`155`	`+// PSRAM tests run on ESP-WROVER-KIT boards, which have the 32k XTAL installed.`
	`156`	`+// Other tests may run on DevKitC boards, which don't have a 32k XTAL.`
`154`	`157`	`TEST_CASE("Test starting external RTC quartz", "[rtc_clk]")`
`155`	`158`	`{`
`156`	`159`	`int i = 0, fail = 0;`
`@@ -182,3 +185,4 @@ TEST_CASE("Test starting external RTC quartz", "[rtc_clk]")`
`182`	`185`	`printf("Test passed successfully\n");`
`183`	`186`	`}`
`184`	`187`	`}`
	`188`	`+#endif // CONFIG_SPIRAM_SUPPORT`