Tweak a few tests so they run on all platforms

test/core_apps.mk

@@ -479,11 +479,11 @@ core-apps-local-deps: build clean
 	$i "Test after swapping my_app_1 and my_app_2 to make sure lexical ordering didnt incidentally build the correct app first"
 
 	$i "Add my_app_2 to the list of local dependencies of my_app_1, don't add lager, but add the lager parse_transform (this will fail unless my_app_2 was indeed built first)"
-	$t mv $(APP)/apps/my_app_1/Makefile{.bak,}
+	$t mv $(APP)/apps/my_app_1/Makefile.bak $(APP)/apps/my_app_1/Makefile
 	$t perl -ni.bak -e 'print;if ($$.==1) {print "LOCAL_DEPS = my_app_2\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_1/Makefile
 
 	$i "Add Lager to the list of dependencies of my_app_2, and add the lager parse_transform"
-	$t mv $(APP)/apps/my_app_2/Makefile{.bak,}
+	$t mv $(APP)/apps/my_app_2/Makefile.bak $(APP)/apps/my_app_2/Makefile
 	$t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\nERLC_OPTS+=+{parse_transform,lager_transform}\n"}' $(APP)/apps/my_app_2/Makefile
 
 	$i "Build the application"

test/core_plugins.mk

@@ -50,11 +50,11 @@ core-plugins-early: build clean
 	$t echo -e "DEPS += cowlib" >> $(APP)/adddep_plugin/early-plugins.mk
 
 	$i "Inject external plugin dependencies into $(APP)"
-	$t echo 'DEPS = ranch' >>$(APP)/Makefile.tmp
-	$t echo 'BUILD_DEPS = adddep_plugin' >>$(APP)/Makefile.tmp
-	$t echo 'DEP_EARLY_PLUGINS = adddep_plugin' >>$(APP)/Makefile.tmp
-	$t echo 'dep_adddep_plugin = cp adddep_plugin' >>$(APP)/Makefile.tmp
-	$t cat $(APP)/Makefile >>$(APP)/Makefile.tmp
+	$t echo 'DEPS = ranch' >> $(APP)/Makefile.tmp
+	$t echo 'BUILD_DEPS = adddep_plugin' >> $(APP)/Makefile.tmp
+	$t echo 'DEP_EARLY_PLUGINS = adddep_plugin' >> $(APP)/Makefile.tmp
+	$t echo 'dep_adddep_plugin = cp adddep_plugin' >> $(APP)/Makefile.tmp
+	$t cat $(APP)/Makefile >> $(APP)/Makefile.tmp
 	$t mv $(APP)/Makefile.tmp $(APP)/Makefile
 
 	$i "Build the application"
@@ -234,10 +234,10 @@ core-plugins-test: build clean
 	$t echo -e "\trm -f markerfile" >> $(APP)/touch_plugin/plugins.mk
 
 	$i "Inject external plugin dependencies into $(APP)"
-	$t echo 'BUILD_DEPS = touch_plugin' >>$(APP)/Makefile.tmp
-	$t echo 'DEP_PLUGINS = touch_plugin' >>$(APP)/Makefile.tmp
-	$t echo 'dep_touch_plugin = cp touch_plugin' >>$(APP)/Makefile.tmp
-	$t cat $(APP)/Makefile >>$(APP)/Makefile.tmp
+	$t echo 'BUILD_DEPS = touch_plugin' >> $(APP)/Makefile.tmp
+	$t echo 'DEP_PLUGINS = touch_plugin' >> $(APP)/Makefile.tmp
+	$t echo 'dep_touch_plugin = cp touch_plugin' >> $(APP)/Makefile.tmp
+	$t cat $(APP)/Makefile >> $(APP)/Makefile.tmp
 	$t mv $(APP)/Makefile.tmp $(APP)/Makefile
 
 	$i "Build the application"