forgotten commits

mmurdoch · Mar 27, 2018 · 6f987b5 · 6f987b5
1 parent f678f9a
commit 6f987b5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoUnit
-version=2.3.0-alpha
+version=2.3.2-alpha
 author=Matthew Murdoch
 maintainer=Matthew Murdoch <[email protected]>
 sentence=Unit test framework for arduino projects.

diff --git a/meta/mkCompare.cpp b/meta/mkCompare.cpp
@@ -314,9 +314,9 @@ int main(int argc, const char *argv[])
 
   mk.out << "#include <stdint.h>" << std::endl;    
   if (includeFlash) {
-    mk.out << "#include <ArduinoUnitUtility/Flash.h>" << std::endl;
+    mk.out << "#include \"ArduinoUnitUtility/Flash.h\"" << std::endl;
   }
-  mk.out << "#include <ArduinoUnitUtility/ArduinoUnitWiden.h>" << std::endl;  
+  mk.out << "#include \"ArduinoUnitUtility/ArduinoUnitWiden.h\"" << std::endl;  
   if (includeString) {
     mk.out << "#include <WString.h>" << std::endl;
   }

diff --git a/src/ArduinoUnit.h b/src/ArduinoUnit.h
@@ -10,13 +10,13 @@
 #include <WString.h>
 #include <Print.h>
 
-#include <ArduinoUnitUtility/Flash.h>
-#include <ArduinoUnitUtility/ArduinoUnitWiden.h>
-#include <ArduinoUnitUtility/ArduinoUnitString.h>
-#include <ArduinoUnitUtility/Compare.h>
-#include <ArduinoUnitUtility/FakeStream.h>
-#include <ArduinoUnitUtility/FakeStreamBuffer.h>
-#include <ArduinoUnitUtility/FreeMemory.h>
+#include "ArduinoUnitUtility/Flash.h"
+#include "ArduinoUnitUtility/ArduinoUnitWiden.h"
+#include "ArduinoUnitUtility/ArduinoUnitString.h"
+#include "ArduinoUnitUtility/Compare.h"
+#include "ArduinoUnitUtility/FakeStream.h"
+#include "ArduinoUnitUtility/FakeStreamBuffer.h"
+#include "ArduinoUnitUtility/FreeMemory.h"
 
 /** \brief This is defined to manage the API transition to 2.X */
 #define ARDUINO_UNIT_MAJOR_VERSION 2
@@ -742,4 +742,3 @@ is in another file (or defined after the assertion on it). */
 #define ASSERT_TEST_NOT_SKIP_MACRO_CHOOSER(...) ASSERT_TEST_NOT_SKIP_CHOOSE(ASSERT_TEST_NOT_SKIP_NO_ARG_EXPANDER __VA_ARGS__ ())
 /** macro generates optional output and calls skip() followed by a return if false. */
 #define assertTestNotSkip(...) ASSERT_TEST_NOT_SKIP_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
-
diff --git a/src/ArduinoUnitUtility/ArduinoUnitString.cpp b/src/ArduinoUnitUtility/ArduinoUnitString.cpp
@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#include <ArduinoUnitUtility/ArduinoUnitString.h>
+#include "ArduinoUnitUtility/ArduinoUnitString.h"
 
 #if ARDUINO_UNIT_USE_FLASH  > 0
 ArduinoUnitString::ArduinoUnitString(const __FlashStringHelper *_data) : data(0x80000000|(uint32_t)_data), debug(false) {}

diff --git a/src/ArduinoUnitUtility/ArduinoUnitString.h b/src/ArduinoUnitUtility/ArduinoUnitString.h
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <WString.h>
 #include <Print.h>
-#include <ArduinoUnitUtility/Flash.h>
+#include "ArduinoUnitUtility/Flash.h"
 
 class ArduinoUnitString : public Printable {
  public:

diff --git a/src/ArduinoUnitUtility/Compare.h b/src/ArduinoUnitUtility/Compare.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <stdint.h>
-#include <ArduinoUnitUtility/Flash.h>
-#include <ArduinoUnitUtility/ArduinoUnitWiden.h>
+#include "ArduinoUnitUtility/Flash.h"
+#include "ArduinoUnitUtility/ArduinoUnitWiden.h"
 #include <WString.h>
 
 template  < typename A, typename B > struct Compare