# HG changeset patch
# User erikj
# Date 1546596029 -3600
# Node ID 6bc1f8d41f4f79584e7c6f62ecf641c44632d24a
# Parent  3ab3cb8a8d41db5f9ff3b9f6fcc2a9a2002eb6f0
8216021: RunTest.gmk might set concurrency level to 1 on Windows
Reviewed-by: ctornqvi, tbell

diff -r 3ab3cb8a8d41 -r 6bc1f8d41f4f make/RunTestsPrebuilt.gmk
--- a/make/RunTestsPrebuilt.gmk	Thu Jan 03 14:55:13 2019 -0800
+++ b/make/RunTestsPrebuilt.gmk	Fri Jan 04 11:00:29 2019 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -237,7 +237,8 @@
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
+          | $(GREP) = | $(SED) 's/\\r//g' \
           | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif